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 | |
| parent | 9a2510de8c9ab65acfa7ec4aee9cf243424ec59c (diff) | |
| parent | ecfe92902d65e46d4f58025723596dd522e09df3 (diff) | |
Merge pull request #542 from henare/import_csv-page-fixes
import_csv page fixes
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 9 | ||||
| -rw-r--r-- | app/views/admin_public_body/import_csv.rhtml | 8 | ||||
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 7 |
3 files changed, 14 insertions, 10 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 diff --git a/app/views/admin_public_body/import_csv.rhtml b/app/views/admin_public_body/import_csv.rhtml index d5717de23..fd652b370 100644 --- a/app/views/admin_public_body/import_csv.rhtml +++ b/app/views/admin_public_body/import_csv.rhtml @@ -36,9 +36,11 @@ </p> <blockquote> - #id,name,request_email,name.es,tag_string<br/> - 1,An Authority,a@example.com,Un organismo,a_tag another_tag<br/> - 2,Another One,another@example.com,Otro organismo,a_tag<br/> + <p> + #id,name,request_email,name.es,tag_string<br/> + 1,An Authority,a@example.com,Un organismo,a_tag another_tag<br/> + 2,Another One,another@example.com,Otro organismo,a_tag<br/> + <p> </blockquote> <p>Supported fields: name (i18n), short_name (i18n), request_email (i18n), notes (i18n), diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 55a6649b2..6d6e7c1ba 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -70,6 +70,13 @@ describe AdminPublicBodyController, "when administering public bodies" do response.should redirect_to(:action=>'list') PublicBody.find_by_tag("department").count.should == n end + + describe 'import_csv' do + it 'should get the page successfully' do + get :import_csv + response.should be_success + end + end end describe AdminPublicBodyController, "when administering public bodies and paying attention to authentication" do |