diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
| commit | 63586e47e1b53bca023fdbba83bff2cd138feaf3 (patch) | |
| tree | 5c9ed659c968f092317de6bab59a712e2584ca66 /app/controllers/admin_public_body_controller.rb | |
| parent | 80e66c0fba234fc78f13d5e7635f65d2bc25fe58 (diff) | |
| parent | b0a939a4d44077b4602176042ff4432b790561ad (diff) | |
Merge branch 'release/0.16' into wdtk
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index e0da234b0..88e275960 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -143,6 +143,8 @@ class AdminPublicBodyController < AdminController @errors = "" if request.post? dry_run_only = (params['commit'] == 'Upload' ? false : true) + # (FIXME: both of these cases could now be changed to use + # PublicBody.import_csv_from_file.) # Read file from params if params[:csv_file] csv_contents = params[:csv_file].read |