diff options
| author | Mark Longair <mhl@pobox.com> | 2013-12-09 09:54:15 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-12-09 09:54:15 +0000 |
| commit | 8724db30b4f953e6d129db399ef9e9a79cd9fee4 (patch) | |
| tree | 1324a10fb4b0ebd21f5538d358ea4d846eff4c9e /app/controllers/admin_public_body_controller.rb | |
| parent | 970d30d7f90177a7dc897e0d06b2f5ad06dffdb8 (diff) | |
| parent | f920268650b6bb906be1828ed26a3732f4d10cc1 (diff) | |
Merge branch 'fix-command-line-csv' into rails-3-develop
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 |