aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-07-19 13:05:34 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-07-19 13:05:34 +0100
commit2a70db0eb8c14fa14c6ca5fe6a738cee4f3f66df (patch)
tree86f5d6de8f310c793a7c6076ab56dd33a5c9b5e1
parent265668f89c19979b74cc9da092282c64e7e7f15b (diff)
Fix bug preventing CSV upload. Fixes #525 (needs tests!)
-rw-r--r--app/controllers/admin_public_body_controller.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 285523e11..25a8d1e08 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -139,14 +139,14 @@ class AdminPublicBodyController < AdminController
end
def import_csv
- if params['commit'] == 'Dry run'
- dry_run_only = true
- elsif params['commit'] == 'Upload'
- dry_run_only = false
- else
- raise "internal error, unknown button label"
- end
if params[:csv_file]
+ if params['commit'] == 'Dry run'
+ dry_run_only = true
+ elsif params['commit'] == 'Upload'
+ dry_run_only = false
+ else
+ raise "internal error, unknown button label"
+ end
csv_contents = params[:csv_file].read
else
csv_contents = session.delete(:previous_csv)