diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-13 08:14:02 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-13 08:14:02 -0700 |
| commit | 1cb96ca9deb4157341d9ab0bce16513593f573d8 (patch) | |
| tree | c3f0fe406548032e1c2c8a8a672305b756475b69 /app/controllers/admin_public_body_controller.rb | |
| parent | 9a2510de8c9ab65acfa7ec4aee9cf243424ec59c (diff) | |
| parent | ecfe92902d65e46d4f58025723596dd522e09df3 (diff) | |
Merge pull request #542 from henare/import_csv-page-fixes
import_csv page fixes
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 285523e11..dd47c1a4f 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -139,13 +139,8 @@ 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 + dry_run_only = (params['commit'] == 'Upload' ? false : true) + if params[:csv_file] csv_contents = params[:csv_file].read else |