diff options
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 6 | ||||
| -rw-r--r-- | app/models/public_body.rb | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 79fa98475..a43be17ce 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_public_body_controller.rb,v 1.7 2008-02-21 16:15:45 francis Exp $ +# $Id: admin_public_body_controller.rb,v 1.8 2008-03-02 23:46:51 francis Exp $ class AdminPublicBodyController < ApplicationController layout "admin" @@ -54,7 +54,9 @@ class AdminPublicBodyController < ApplicationController end def destroy - PublicBody.find(params[:id]).destroy + public_body = PublicBody.find(params[:id]) + public_body.tag_string = "" + public_body.destroy flash[:notice] = "PublicBody was successfully destroyed." redirect_to admin_url('body/list') end diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 12fe880c2..c92972df1 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -22,7 +22,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: public_body.rb,v 1.28 2008-03-02 23:43:09 francis Exp $ +# $Id: public_body.rb,v 1.29 2008-03-02 23:46:51 francis Exp $ require 'csv' require 'set' @@ -134,7 +134,6 @@ class PublicBody < ActiveRecord::Base else # New public body public_body = PublicBody.new(:name => name, :request_email => email, :complaint_email => "", :short_name => "", :last_edit_editor => "import_csv", :last_edit_comment => 'Created from spreadsheet') - public_body.save! # XXX shouldn't need this save, but without it the PublicBodyTag doesn't validate as no PublicBody id, and there is no harm cause we're in a transaction public_body.tag_string = tag public_body.save! |