diff options
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/incoming_message.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 3e574b10f..5c91cb7b1 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -278,7 +278,7 @@ class AdminRequestController < AdminController if params[:incoming_message_id] incoming_message = IncomingMessage.find(params[:incoming_message_id]) - email = incoming_message.mail.from_addrs[0].address + email = incoming_message.from_address name = incoming_message.safe_mail_from || info_request.public_body.name else email = info_request.public_body.request_email diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 60828e179..cfa0d59da 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -85,6 +85,10 @@ class IncomingMessage < ActiveRecord::Base @mail end + def from_address + self.mail.from_addrs[0].address + end + # Returns the name of the person the incoming message is from, or nil if # there isn't one or if there is only an email address. XXX can probably # remove from_name_if_present (which is a monkey patch) by just calling |