diff --git a/back-office/app/controllers/items_controller.rb b/back-office/app/controllers/items_controller.rb
index c6f6994..7599fe9 100644
--- a/back-office/app/controllers/items_controller.rb
+++ b/back-office/app/controllers/items_controller.rb
@@ -46,35 +46,37 @@ class ItemsController < ApplicationController
@csv_content = params[:csv_content]
@error_message = ""
- @error_message = "Format of CSV is wrong (CSV content is empty)" if params[:csv_content] == ""
- csv_parsed = CSV.parse(params[:csv_content])
- csv_file = ItemsHelper::create_csv(csv_parsed)
+ if params[:csv_content] == ""
+ @error_message = "Format of CSV is wrong (CSV content is empty)"
+ else
+ csv_parsed = CSV.parse(params[:csv_content])
+ csv_file = ItemsHelper::create_csv(csv_parsed)
- @output = ""
+ @output = ""
- begin
- ENV["INPUT"] = csv_file.path
+ begin
+ ENV["INPUT"] = csv_file.path
- case params[:task]
- when 'validate_items'
- @output = ItemsHelper::execute_command("rake ribica:validate_items")
- #ItemsHelper::execute_command("rake ribica:reindex")
- when 'import_items'
- @output = ItemsHelper::execute_command("rake ribica:import_items")
- #ItemsHelper::execute_command("rake ribica:reindex")
- when 'update_prices'
- @output = ItemsHelper::execute_command("rake ribica:update_prices")
- #ItemsHelper::execute_command("rake ribica:reindex")
- else
- @error_message = "There is no such task"
+ case params[:task]
+ when 'validate_items'
+ @output = ItemsHelper::execute_command("rake ribica:validate_items")
+ #ItemsHelper::execute_command("rake ribica:reindex")
+ when 'import_items'
+ @output = ItemsHelper::execute_command("rake ribica:import_items")
+ #ItemsHelper::execute_command("rake ribica:reindex")
+ when 'update_prices'
+ @output = ItemsHelper::execute_command("rake ribica:update_prices")
+ #ItemsHelper::execute_command("rake ribica:reindex")
+ else
+ @error_message = "There is no such task"
+ end
+ ensure
+ csv_file.unlink
end
- ensure
- sleep 5
- csv_file.unlink
- end
- @output = @output.join("
")
+ @output = @output.join("
")
+ end
render :template => "items/export_import"
end