From d0a089fb779a4cd24bcd07e9591425f8ec593bc6 Mon Sep 17 00:00:00 2001 From: dinedine Date: Sun, 19 Dec 2010 21:34:01 +0100 Subject: [PATCH] DelayedJob is disabled by default --- app/controllers/admin/installation_controller.rb | 2 ++ config/initializers/locomotive.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/installation_controller.rb b/app/controllers/admin/installation_controller.rb index f2b7359d..4b766351 100644 --- a/app/controllers/admin/installation_controller.rb +++ b/app/controllers/admin/installation_controller.rb @@ -45,7 +45,9 @@ module Admin if @site.valid? # begin + unless params[:zipfile].blank? Locomotive::Import::Job.run!(params[:zipfile], @site, { :samples => true }) + end # rescue Exception => e # logger.error "Import failed because of #{e.message}" # end diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb index b46cc2d6..4a4ce383 100644 --- a/config/initializers/locomotive.rb +++ b/config/initializers/locomotive.rb @@ -29,7 +29,7 @@ Locomotive.configure do |config| # Locomotive uses the DelayedJob gem for the theme import module. # In case you want to deploy to Heroku, you will have to pay for an extra dyno. # If you do not mind about importing theme without DelayedJob, disable it. - config.delayed_job = true + config.delayed_job = false # default locale (for now, only en and fr are supported) config.default_locale = :en