From 6afb00eeb973e843e7a56ff20c9783ad0c5dc9c2 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Wed, 22 Aug 2012 10:37:16 +0100
Subject: Allow external requests to be hidden from the admin interface.

---
 app/controllers/admin_request_controller.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(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 ecbc35e1e..c5abf8769 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -362,14 +362,18 @@ class AdminRequestController < AdminController
             info_request.set_described_state(params[:reason])
             info_request.save!
 
-            ContactMailer.deliver_from_admin_message(
-                    info_request.user,
-                    subject,
-                    params[:explanation]
-                )
+            if ! info_request.is_external?
+                ContactMailer.deliver_from_admin_message(
+                        info_request.user,
+                        subject,
+                        params[:explanation]
+                    )
+                flash[:notice] = _("Your message to {{recipient_user_name}} has been sent",:recipient_user_name=>CGI.escapeHTML(info_request.user.name))
+            else
+                flash[:notice] = _("This external request has been hidden")
+            end
             # expire cached files
             expire_for_request(info_request)
-            flash[:notice] = _("Your message to {{recipient_user_name}} has been sent",:recipient_user_name=>CGI.escapeHTML(info_request.user.name))
             redirect_to request_admin_url(info_request)
         end
     end
-- 
cgit v1.2.3