diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 5 | ||||
| -rw-r--r-- | app/models/public_body.rb | 9 |
2 files changed, 3 insertions, 11 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! |