Requires admin attention emails should include a full URL to the admin page of the request so you can click it, not just a relative path

2 files changed, 16 insertions, 1 deletions

diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 3fc6b0471..be0f68417 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -70,7 +70,7 @@ class RequestMailer < ApplicationMailer
         @recipients = contact_from_name_and_email
         @subject = _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title)
         url = main_url(request_url(info_request))
-        admin_url = request_admin_url(info_request)
+        admin_url = main_url(request_admin_url(info_request))
         @body = {:reported_by => user, :info_request => info_request, :url => url, :admin_url => admin_url }
     end
 
diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb
index 84804d4ca..57041b417 100644
--- a/spec/models/request_mailer_spec.rb
+++ b/spec/models/request_mailer_spec.rb
@@ -327,3 +327,18 @@ describe RequestMailer, 'when sending mail when someone has updated an old uncla
 
 end
 
+describe RequestMailer, 'requires_admin' do
+    it 'body should contain the full admin URL' do
+        user = mock_model(User, :name_and_email => 'Bruce Jones',
+                                :name => 'Bruce Jones')
+        info_request = mock_model(InfoRequest, :user => user,
+                                               :described_state => 'error_message',
+                                               :title => 'Test request',
+                                               :url_title => 'test_request',
+                                               :law_used_short => 'FOI',
+                                               :id => 123)
+        mail = RequestMailer.deliver_requires_admin(info_request)
+
+        mail.body.should include('http://test.host/admin/request/show/123')
+    end
+end