3 files changed, 12 insertions, 16 deletions
diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml
index c23b4060a..569132861 100644
--- a/app/views/admin_request/_incoming_message_actions.rhtml
+++ b/app/views/admin_request/_incoming_message_actions.rhtml
@@ -1,6 +1,6 @@
 <% form_tag '../redeliver_incoming' do %>
   <div>
-      id or url_title of request:
+      id or url_title of request (or a list of requests, comma-separated):
       <% if @info_requests && @info_requests.size == 1 %>
         <%= text_field_tag 'url_title', @info_requests[0].url_title, { :size => 20 } %>
       <% else %>
diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml
index b659c676d..4026ee712 100644
--- a/app/views/admin_request/edit.rhtml
+++ b/app/views/admin_request/edit.rhtml
@@ -22,20 +22,7 @@
    </p>
 
    <p><label for="info_request_described_state"><strong>Described state</strong></label> 
-   <%= select( 'info_request', "described_state",
-       [ 
-        'waiting_response',
-        'waiting_clarification', 
-        'gone_postal',
-        'not_held',
-        'rejected', 
-        'successful', 
-        'partially_successful',
-        'internal_review',
-        'error_message',
-        'requires_admin',
-        'user_withdrawn'
-    ]) %>;
+   <%= select( 'info_request', "described_state", InfoRequest.enumerate_states ) %>;
     <label for="info_request_awaiting_description"><strong>Awaiting description</strong></label>
    <%= select('info_request', "awaiting_description", [["Yes - needs state updating",true],["No - state is up to date",false]]) %>
    <br/>(don't forget to change 'awaiting description' when you set described state)<br/>
@@ -60,7 +47,7 @@
 
 <hr>
 
-<% form_tag '../fully_destroy/' + @info_request.id.to_s do %>
+<% form_tag '../destroy/' + @info_request.id.to_s do %>
     <p>
     <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destory request entirely' %>
     <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It
diff --git a/app/views/admin_request/hidden_user_explanation.rhtml b/app/views/admin_request/hidden_user_explanation.rhtml
new file mode 100644
index 000000000..64387ffee
--- /dev/null
+++ b/app/views/admin_request/hidden_user_explanation.rhtml
@@ -0,0 +1,9 @@
+Dear <%= name_to %>,
+
+Your request '<%= info_request.title %>' at <%= info_request_url %> has been reviewed by moderators.  
+
+We consider it <% if reason == 'not_foi' %>is not a valid FOI request<% else %>to be vexatious<% end%>, and have therefore hidden it from other users. You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further.
+
+Yours,
+
+The <%= site_name %> team.