diff options
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 16 | ||||
| -rw-r--r-- | app/views/admin_request/show_raw_email.rhtml | 6 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 646aaacc1..ae244797c 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.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: admin_request_controller.rb,v 1.21 2008-09-23 21:00:13 francis Exp $ +# $Id: admin_request_controller.rb,v 1.22 2008-09-24 19:42:50 francis Exp $ class AdminRequestController < ApplicationController layout "admin" @@ -205,6 +205,20 @@ class AdminRequestController < ApplicationController def show_raw_email @raw_email = RawEmail.find(params[:id]) + + @holding_pen = false + if (@raw_email.incoming_message.info_request == InfoRequest.holding_pen_request) + @holding_pen = true + + email = @raw_email.incoming_message.mail.from_addrs[0].spec + user_domain = email + user_domain =~ /@(.*)/ + user_domain = $1 + user_domain = 'localhost' + + @public_bodies = PublicBody.find(:all, :order => "name", + :conditions => [ "lower(request_email) like lower('%'||?||'%')", user_domain ]) + end end private diff --git a/app/views/admin_request/show_raw_email.rhtml b/app/views/admin_request/show_raw_email.rhtml index 38050be79..40c1e3957 100644 --- a/app/views/admin_request/show_raw_email.rhtml +++ b/app/views/admin_request/show_raw_email.rhtml @@ -4,6 +4,12 @@ <p> FOI request: <%= link_to request_both_links(@raw_email.incoming_message.info_request) %> + <% if @holding_pen && @public_bodies.size > 0 %> + <br>Guessed authority: + <% for public_body in @public_bodies %> + <%=public_body_both_links(public_body)%> + <% end %> + <% end %> </p> <h2>Actions</h2> |