don't do anything if csv_content is empty
This commit is contained in:
@@ -46,8 +46,10 @@ class ItemsController < ApplicationController
|
|||||||
@csv_content = params[:csv_content]
|
@csv_content = params[:csv_content]
|
||||||
|
|
||||||
@error_message = ""
|
@error_message = ""
|
||||||
@error_message = "Format of CSV is wrong (CSV content is empty)" if params[:csv_content] == ""
|
|
||||||
|
|
||||||
|
if params[:csv_content] == ""
|
||||||
|
@error_message = "Format of CSV is wrong (CSV content is empty)"
|
||||||
|
else
|
||||||
csv_parsed = CSV.parse(params[:csv_content])
|
csv_parsed = CSV.parse(params[:csv_content])
|
||||||
csv_file = ItemsHelper::create_csv(csv_parsed)
|
csv_file = ItemsHelper::create_csv(csv_parsed)
|
||||||
|
|
||||||
@@ -70,11 +72,11 @@ class ItemsController < ApplicationController
|
|||||||
@error_message = "There is no such task"
|
@error_message = "There is no such task"
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
sleep 5
|
|
||||||
csv_file.unlink
|
csv_file.unlink
|
||||||
end
|
end
|
||||||
|
|
||||||
@output = @output.join("<br/>")
|
@output = @output.join("<br/>")
|
||||||
|
end
|
||||||
|
|
||||||
render :template => "items/export_import"
|
render :template => "items/export_import"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user