diff --git a/back-office/app/controllers/items_controller.rb b/back-office/app/controllers/items_controller.rb index 1398781..6098a32 100644 --- a/back-office/app/controllers/items_controller.rb +++ b/back-office/app/controllers/items_controller.rb @@ -74,10 +74,10 @@ class ItemsController < ApplicationController when 'import_items' @output = ItemsHelper::execute_command("rake ribica:import_items -f #{Rails.root}/Rakefile") @output.collect{|x| x.sub! "\n", "" } - ItemsHelper::execute_command("rake ribica:reindex -f #{Rails.root}/Rakefile") unless RakeTasksHelper::is_error_occurred @output + %x(rake ribica:reindex -f #{Rails.root}/Rakefile) unless RakeTasksHelper::is_error_occurred @output when 'update_prices' @output = ItemsHelper::execute_command("rake ribica:update_prices -f #{Rails.root}/Rakefile") - ItemsHelper::execute_command("rake ribica:reindex -f #{Rails.root}/Rakefile") unless RakeTasksHelper::is_error_occurred @output + %x(rake ribica:reindex -f #{Rails.root}/Rakefile) unless RakeTasksHelper::is_error_occurred @output else @error_message = "There is no such task" end diff --git a/back-office/lib/tasks/ribica.rake b/back-office/lib/tasks/ribica.rake index 47ca5dc..22f5552 100644 --- a/back-office/lib/tasks/ribica.rake +++ b/back-office/lib/tasks/ribica.rake @@ -248,7 +248,7 @@ def do_import(validate_only) end lookup = get_column_lookup - path = Rails.root.join(input_file) + path = Rails.root.join(input_file) if validate_only log_filename = Rails.root.join("import.log") log_filename = Rails.root.join("import_validate.log")