Merge branch 'rails-3-develop' into release/0.20

1 files changed, 3 insertions, 8 deletions

diff --git a/app/controllers/admin_public_body_headings_controller.rb b/app/controllers/admin_public_body_headings_controller.rb
index c7c80e802..e893e760d 100644
--- a/app/controllers/admin_public_body_headings_controller.rb
+++ b/app/controllers/admin_public_body_headings_controller.rb
@@ -10,8 +10,10 @@ class AdminPublicBodyHeadingsController < AdminController
             @heading = PublicBodyHeading.find(params[:id])
             if @heading.update_attributes(params[:public_body_heading])
                 flash[:notice] = 'Category heading was successfully updated.'
+                redirect_to edit_admin_heading_path(@heading)
+            else
+                render :action => 'edit'
             end
-            render :action => 'edit'
         end
     end
 
@@ -54,13 +56,6 @@ class AdminPublicBodyHeadingsController < AdminController
         @locale = self.locale_from_params()
         I18n.with_locale(@locale) do
             heading = PublicBodyHeading.find(params[:id])
-
-            if heading.public_body_categories.count > 0
-                flash[:notice] = "There are categories associated with this heading, so can't destroy it"
-                redirect_to edit_admin_heading_url(heading)
-                return
-            end
-
             heading.destroy
             flash[:notice] = "Category heading was successfully destroyed."
             redirect_to admin_categories_url