diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-08 16:07:27 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-08 16:07:27 +0100 |
| commit | 0d630ab2c87d925d27879c1cc0db55b0286e46d6 (patch) | |
| tree | cbfbfb99f699f35bdc62153b17f23c3536a82577 | |
| parent | 3352751031eaa2e34ffb988bf65066a2c4f58142 (diff) | |
The generated Message-Id value uses the id of the OutgoingMessage, which
is not assigned till the object is saved. So we need to save it before
we send the message.
| -rw-r--r-- | app/models/outgoing_message.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 669fffb56..bbd227793 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -169,11 +169,11 @@ class OutgoingMessage < ActiveRecord::Base def send_message(log_event_type = 'sent') if self.status == 'ready' if self.message_type == 'initial_request' - mail_message = OutgoingMailer.deliver_initial_request(self.info_request, self) - self.last_sent_at = Time.now self.status = 'sent' self.save! + + mail_message = OutgoingMailer.deliver_initial_request(self.info_request, self) self.info_request.log_event(log_event_type, { :email => mail_message.to_addrs.join(", "), :outgoing_message_id => self.id, @@ -181,11 +181,11 @@ class OutgoingMessage < ActiveRecord::Base }) self.info_request.set_described_state('waiting_response') elsif self.message_type == 'followup' - mail_message = OutgoingMailer.deliver_followup(self.info_request, self, self.incoming_message_followup) - self.last_sent_at = Time.now self.status = 'sent' self.save! + + mail_message = OutgoingMailer.deliver_followup(self.info_request, self, self.incoming_message_followup) self.info_request.log_event('followup_' + log_event_type, { :email => mail_message.to_addrs.join(", "), :outgoing_message_id => self.id, |