diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-11-19 14:00:18 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-11-19 14:00:18 +0000 |
| commit | 30acdb97eb91f073ee6fde063fb5cb0e9f73a002 (patch) | |
| tree | cef3bbe42bd0300df4f2164558659c36498ef9f7 /app/controllers/admin_public_body_headings_controller.rb | |
| parent | ce30679a74a14d0f52bf14b7dc29113aa54d0b0a (diff) | |
| parent | bce02be0a6cab397bba9470126e38ff67ee7465d (diff) | |
Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_public_body_headings_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_headings_controller.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/controllers/admin_public_body_headings_controller.rb b/app/controllers/admin_public_body_headings_controller.rb index 84e5cbf35..e893e760d 100644 --- a/app/controllers/admin_public_body_headings_controller.rb +++ b/app/controllers/admin_public_body_headings_controller.rb @@ -56,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 |