Merge branch 'release/0.5' into develop

1 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index c6904da95..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
@@ -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