Merge branch 'issue_393' of https://github.com/henare/alaveteli into release/0.5

3 files changed, 12 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
 
diff --git a/config/routes.rb b/config/routes.rb
index eeeebc3ea..c4339209a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -169,6 +169,7 @@ ActionController::Routing::Routes.draw do |map|
         body.admin_body_create '/admin/body/create/:id', :action => 'create'
         body.admin_body_destroy '/admin/body/destroy/:id', :action => 'destroy'
         body.admin_body_import_csv '/admin/body/import_csv', :action => 'import_csv'
+        body.admin_body_mass_tag_add '/admin/body/mass_tag_add', :action => 'mass_tag_add'
     end
 
     map.with_options :controller => 'admin_general' do |admin|
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 7af637c1c..08d465ca5 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -67,6 +67,14 @@ describe AdminPublicBodyController, "when administering public bodies" do
         get :show, :id => 2
         session[:using_admin].should == 1
     end
+
+    it "mass assigns tags" do
+        n = PublicBody.count
+        post :mass_tag_add, { :new_tag => "department", :table_name => "substring" }
+        response.flash[:notice].should == "Added tag to table of bodies."
+        response.should redirect_to(:action=>'list')
+        PublicBody.find_by_tag("department").count.should == n
+    end
 end
 
 describe AdminPublicBodyController, "when administering public bodies and paying attention to authentication" do