From b558fe5dcebf03599627bca83a14df50408f81c7 Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Sun, 3 Jun 2012 23:20:40 +0100 Subject: Allow subject to be specified when request hidden When a request is hidden by an admin, allow the subject line to be specified. --- app/controllers/admin_request_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/controllers/admin_request_controller.rb') 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)) -- cgit v1.2.3 From 4ec7f6edbf2c00abc8464eafc889047f43533f90 Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Mon, 4 Jun 2012 00:05:46 +0100 Subject: Log an event when a request is hidden --- app/controllers/admin_request_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'app/controllers/admin_request_controller.rb') diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 4821a14e2..fd1405319 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -343,8 +343,16 @@ class AdminRequestController < AdminController subject = params[:subject] explanation = params[:explanation] info_request = InfoRequest.find(params[:id]) - info_request.set_described_state(params[:reason]) info_request.prominence = "requester_only" + + info_request.log_event("hide", { + :editor => admin_http_auth_user(), + :reason => params[:reason], + :subject => subject, + :explanation => explanation + }) + + info_request.set_described_state(params[:reason]) info_request.save! ContactMailer.deliver_from_admin_message( -- cgit v1.2.3