diff options
| author | francis <francis> | 2008-04-21 13:55:34 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-04-21 13:55:34 +0000 |
| commit | 9dc056ae18b005524d3c37042d5a3c4b1c043efb (patch) | |
| tree | cb1661a8d6d0e1deec9b9bff49d82b1ea064fa55 | |
| parent | f5433714928b8e87e4a7531f5f861f1385cbcbaa (diff) | |
Minor text changes
| -rw-r--r-- | app/models/public_body.rb | 3 | ||||
| -rw-r--r-- | app/views/admin_public_body/edit.rhtml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index a57bf2d2c..3120eb96f 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -21,7 +21,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.63 2008-04-18 08:54:36 francis Exp $ +# $Id: public_body.rb,v 1.64 2008-04-21 13:55:34 francis Exp $ require 'csv' require 'set' @@ -180,7 +180,6 @@ class PublicBody < ActiveRecord::Base name = row[1] email = row[2] next if name.nil? - #or email.nil? if email.nil? email = '' # unknown/bad contact is empty string end diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml index e7791c450..fbc750db1 100644 --- a/app/views/admin_public_body/edit.rhtml +++ b/app/views/admin_public_body/edit.rhtml @@ -15,7 +15,7 @@ <% form_tag('../destroy/' + @public_body.id.to_s) do %> <p> <%= hidden_field_tag(:public_body_id, { :value => @public_body.id } ) %> - <%= submit_tag "Destroy " + @public_body.short_or_long_name %> (this is permanent!) + <%= submit_tag "Destroy " + @public_body.name %> (this is permanent!) </p> <% end %> |