diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/incoming_message.rb | 5 | ||||
| -rw-r--r-- | app/models/public_body.rb | 9 | ||||
| -rw-r--r-- | app/views/admin_public_body/_form.rhtml | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index aef293677..c2633df94 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -18,7 +18,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.65 2008-03-16 22:48:42 francis Exp $ +# $Id: incoming_message.rb,v 1.66 2008-03-17 10:48:46 francis Exp $ # TODO @@ -139,9 +139,6 @@ class IncomingMessage < ActiveRecord::Base if not self.info_request.public_body.request_email.empty? text = text.gsub(self.info_request.public_body.request_email, "[" + self.info_request.public_body.short_or_long_name + " request email]") end - if not self.info_request.public_body.complaint_email.empty? - text = text.gsub(self.info_request.public_body.complaint_email, "[" + self.info_request.public_body.short_or_long_name + " complaint email]") - end text = text.gsub(self.info_request.incoming_email, "[FOI #" + self.info_request.id.to_s + " email]") text = text.gsub(self.info_request.envelope_email, "[FOI #" + self.info_request.id.to_s + " bounce email]") text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[WhatDoTheyKnow contact email]") diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 768da2a79..9417aab83 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.37 2008-03-17 10:36:43 francis Exp $ +# $Id: public_body.rb,v 1.38 2008-03-17 10:48:46 francis Exp $ require 'csv' require 'set' @@ -51,11 +51,6 @@ class PublicBody < ActiveRecord::Base errors.add(:request_email, "doesn't look like a valid email address") end end - if self.complaint_email != "" - unless MySociety::Validate.is_valid_email(self.complaint_email) - errors.add(:complaint_email, "doesn't look like a valid email address") - end - end end acts_as_versioned @@ -149,7 +144,7 @@ class PublicBody < ActiveRecord::Base end 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 = PublicBody.new(:name => name, :request_email => email, :short_name => "", :last_edit_editor => "import_csv", :last_edit_comment => 'Created from spreadsheet') public_body.tag_string = tag public_body.save! diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml index 4f1ede2cc..d53ab8134 100644 --- a/app/views/admin_public_body/_form.rhtml +++ b/app/views/admin_public_body/_form.rhtml @@ -18,9 +18,6 @@ <p><label for="public_body_request_email">Request email (set to blank if an old address became bad and you can't find a new one)</label><br/> <%= text_field 'public_body', 'request_email', :size => 40 %></p> -<p><label for="public_body_complaint_email">Complaint email</label><br/> -<%= text_field 'public_body', 'complaint_email', :size => 40 %></p> - <p><label for="public_body_last_edit_comment">Comment for this edit</label> (put URL or other source of new info)<br/> <%= text_area 'public_body', 'last_edit_comment', :rows => 3, :cols => 60 %></p> <!--[eoform:public_body]--> |