aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-03 23:20:40 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-03 23:20:40 +0100
commitb558fe5dcebf03599627bca83a14df50408f81c7 (patch)
treeadd1b32eedbc43ecd2cf7b4b9c41e6df6c53377e
parenta403ada06692a3f26899dc398afe2c0611dfcfe4 (diff)
Allow subject to be specified when request hidden
When a request is hidden by an admin, allow the subject line to be specified.
-rw-r--r--app/controllers/admin_request_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 522e1cd39..4821a14e2 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -340,6 +340,7 @@ class AdminRequestController < AdminController
def hide_request
ActiveRecord::Base.transaction do
+ subject = params[:subject]
explanation = params[:explanation]
info_request = InfoRequest.find(params[:id])
info_request.set_described_state(params[:reason])
@@ -348,7 +349,7 @@ class AdminRequestController < AdminController
ContactMailer.deliver_from_admin_message(
info_request.user,
- "hello",
+ subject,
params[:explanation]
)
flash[:notice] = _("Your message to {{recipient_user_name}} has been sent",:recipient_user_name=>CGI.escapeHTML(info_request.user.name))