diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
| commit | 7414ed478f212be2b48c95fafde15726b348b197 (patch) | |
| tree | 1d89b90f604b837b097fb4274775c4f3b3a319d6 /app/models/info_request_batch.rb | |
| parent | 479c9cd4567e2042d00c347f25a411373a6b1df9 (diff) | |
| parent | d05082c1cf1ddec789e547b54943f6e7d5bdffc1 (diff) | |
Merge branch 'release/0.20'0.20.0.0
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/models/info_request_batch.rb')
| -rw-r--r-- | app/models/info_request_batch.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/info_request_batch.rb b/app/models/info_request_batch.rb index d7c5eb9af..8a5ebeaba 100644 --- a/app/models/info_request_batch.rb +++ b/app/models/info_request_batch.rb @@ -46,7 +46,13 @@ class InfoRequestBatch < ActiveRecord::Base self.sent_at = Time.now self.save! end - created.each{ |info_request| info_request.outgoing_messages.first.send_message } + created.each do |info_request| + outgoing_message = info_request.outgoing_messages.first + + outgoing_message.sendable? + mail_message = OutgoingMailer.initial_request(outgoing_message.info_request, outgoing_message).deliver + outgoing_message.record_email_delivery(mail_message.to_addrs.join(', '), mail_message.message_id) + end return unrequestable end |