Merge remote-tracking branch 'openaustralia_github/one_support_email_on_admin_attention_state' into develop

Conflicts:
    Gemfile.lock
    app/controllers/request_controller.rb
    app/models/request_mailer.rb
    app/views/admin_general/index.rhtml
    spec/models/request_mailer_spec.rb

1 files changed, 3 insertions, 7 deletions

diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 6f8d88a1a..955f73ef4 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -62,18 +62,14 @@ class RequestMailer < ApplicationMailer
     end
 
     # An FOI response is outside the scope of the system, and needs admin attention
-    def requires_admin(info_request, set_by = nil)
-        if !set_by.nil?
-            user = set_by
-        else
-            user = info_request.user
-        end
+    def requires_admin(info_request, set_by = nil, message = "")
+        user = set_by || info_request.user
         @from = user.name_and_email
         @recipients = contact_from_name_and_email
         @subject = _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title)
         url = request_url(info_request)
         admin_url = admin_request_show_url(info_request)
-        @body = {:reported_by => user, :info_request => info_request, :url => url, :admin_url => admin_url }
+        @body = {:reported_by => user, :message => message, :info_request => info_request, :url => url, :admin_url => admin_url }
     end
 
     # Tell the requester that a new response has arrived