aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-09-21 23:19:54 +0000
committerfrancis <francis>2008-09-21 23:19:54 +0000
commitaf36ec43e4b6062e604c74ef1aae9f88b9ad0b8e (patch)
treecb1ef9393b2f937faeb738ba65914dc7760201b7
parentab366a520dc91c50d6f120f275eef707319a8721 (diff)
Send requires_admin message from the user who marked it up, so can reply to it more easily.
-rw-r--r--app/models/request_mailer.rb6
-rw-r--r--app/views/request_mailer/requires_admin.rhtml8
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index a0b5ba70e..ed5ed9ff6 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_mailer.rb,v 1.56 2008-09-04 11:11:40 francis Exp $
+# $Id: request_mailer.rb,v 1.57 2008-09-21 23:19:54 francis Exp $
class RequestMailer < ApplicationMailer
@@ -83,8 +83,8 @@ class RequestMailer < ApplicationMailer
# An FOI response is outside the scope of the system, and needs admin attention
def requires_admin(info_request, details)
- @from = contact_from_name_and_email
- @recipients = @from
+ @from = info_request.user.name_and_email
+ @recipients = contact_from_name_and_email
@subject = "Unusual FOI response - " + info_request.title
url = main_url(request_url(info_request))
admin_url = request_admin_url(info_request)
diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml
index 4b9f0ddfa..45b75138a 100644
--- a/app/views/request_mailer/requires_admin.rhtml
+++ b/app/views/request_mailer/requires_admin.rhtml
@@ -1,6 +1,7 @@
-A user has reported an <%=@info_request.law_used_short%> response as being
-unusual, or out of the scope of the system. Take a look, and contact the user
-to let them know what you are going to do about it.
+---------------------------------------------------------------------
+<%=@info_request.user.name%> has reported an <%=@info_request.law_used_short%>
+response as being unusual, or out of the scope of the system. Take a look, and
+reply to this email to let them know what you are going to do about it.
Request '<%=@info_request.title%>':
<%= @url %>
@@ -9,3 +10,4 @@ Details: "<%= @details %>"
Administration URL:
<%= @admin_url %>
+---------------------------------------------------------------------