diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-15 15:18:09 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-15 15:18:09 +1100 |
| commit | d348cbf1de3d10818e4994c04f842c15bb333b99 (patch) | |
| tree | fcc887f4bca2677361ba709c8068cfe706d52c00 | |
| parent | b9fb43758d9a3f918fad78ff7d868e3f3c7e50a2 (diff) | |
Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929da
| -rw-r--r-- | app/controllers/request_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/info_request.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 33f18e737..e69147b0b 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -427,7 +427,6 @@ class RequestController < ApplicationController # admin user (not because you also own the request). if !info_request.is_actual_owning_user?(authenticated_user) # 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? 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_path(info_request))) redirect_to categorise_play_url diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 130c5b02c..156399b99 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -587,7 +587,7 @@ public RequestClassification.create!(:user_id => set_by.id, :info_request_event_id => event.id) - RequestMailer.deliver_old_unclassified_updated(self) if !is_external? + RequestMailer.old_unclassified_updated(self).deliver if !is_external? end end |