aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-02-25 18:16:12 +1100
committerHenare Degan <henare.degan@gmail.com>2013-02-25 18:16:12 +1100
commit3e4ef4da5374c1dd6d32ac9351decc9bb6851355 (patch)
tree5d4f6c3fc89988fc909d4a39579951d0ef99ebc9 /app
parent532a21ba4941197a13524ac3f1ce9267a46bec1d (diff)
Update to new mail sending API
Diffstat (limited to 'app')
-rw-r--r--app/controllers/request_controller.rb2
-rw-r--r--app/mailers/request_mailer.rb2
-rw-r--r--app/mailers/track_mailer.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 8786de9fc..daf290675 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -437,7 +437,7 @@ class RequestController < ApplicationController
:info_request_event_id => event.id)
# Don't give advice on what to do next, as it isn't their request
- RequestMailer.deliver_old_unclassified_updated(@info_request) if !@info_request.is_external?
+ RequestMailer.old_unclassified_updated(@info_request).deliver if !@info_request.is_external?
if session[:request_game]
flash[:notice] = _('Thank you for updating the status of the request \'<a href="{{url}}">{{info_request_title}}</a>\'. There are some more requests below for you to classify.',:info_request_title=>CGI.escapeHTML(@info_request.title), :url=>CGI.escapeHTML(request_url(@info_request)))
redirect_to play_url
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb
index 33b4bea54..c41aa7eef 100644
--- a/app/mailers/request_mailer.rb
+++ b/app/mailers/request_mailer.rb
@@ -350,7 +350,7 @@ class RequestMailer < ApplicationMailer
store_sent.alert_type = type_code
store_sent.info_request_event_id = alert_event_id
# XXX uses same template for reminder 1 and reminder 2 right now.
- RequestMailer.deliver_new_response_reminder_alert(info_request, last_response_message)
+ RequestMailer.new_response_reminder_alert(info_request, last_response_message).deliver
store_sent.save!
end
end
diff --git a/app/mailers/track_mailer.rb b/app/mailers/track_mailer.rb
index 03310478a..327c5c8cd 100644
--- a/app/mailers/track_mailer.rb
+++ b/app/mailers/track_mailer.rb
@@ -92,7 +92,7 @@ class TrackMailer < ApplicationMailer
# Send the email
I18n.with_locale(user.get_locale) do
- TrackMailer.deliver_event_digest(user, email_about_things)
+ TrackMailer.event_digest(user, email_about_things).deliver
end
end