From 99d30f0f31578c462ef317b4dc98b112196fe713 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Tue, 31 Jan 2012 17:15:50 +1100 Subject: Controller tests were failing for these actions - switching to more concise URL helpers seemed to fix things up --- app/controllers/admin_public_body_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/admin_public_body_controller.rb') diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index c6904da95..fbb081482 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -127,14 +127,14 @@ class AdminPublicBodyController < AdminController if public_body.info_requests.size > 0 flash[:notice] = "There are requests associated with the authority, so can't destroy it" - redirect_to admin_url('body/show/' + public_body.id.to_s) + redirect_to admin_body_show_url(public_body) return end public_body.tag_string = "" public_body.destroy flash[:notice] = "PublicBody was successfully destroyed." - redirect_to admin_url('body/list') + redirect_to admin_body_list_url end end -- cgit v1.2.3 From 8dbc0b891801e1605ae08774eae69f71242808d6 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Tue, 31 Jan 2012 17:17:13 +1100 Subject: Fixes #393 - Route the mass_assign_tags action so it does what it says on the tin --- app/controllers/admin_public_body_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/admin_public_body_controller.rb') diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index fbb081482..bf7c07905 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -56,7 +56,7 @@ class AdminPublicBodyController < AdminController flash[:notice] = "Added tag to table of bodies." end - redirect_to admin_url('body/list') + "?query=" + @query + (@page.nil? ? "" : "&page=" + @page) # XXX construct this URL properly + redirect_to admin_body_list_url(:query => @query, :page => @page) end def missing_scheme -- cgit v1.2.3