diff options
| -rw-r--r-- | app/views/admin_request/_incoming_message_actions.rhtml | 19 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 24 | ||||
| -rw-r--r-- | app/views/admin_request/show_raw_email.rhtml | 10 |
3 files changed, 31 insertions, 22 deletions
diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml new file mode 100644 index 000000000..790a25db6 --- /dev/null +++ b/app/views/admin_request/_incoming_message_actions.rhtml @@ -0,0 +1,19 @@ +<% form_tag '../destroy_incoming' do %> + <div> + <%= hidden_field_tag 'incoming_message_id', incoming_message.id %> + <%= submit_tag "Destroy message" %> + </div> +<% end %> + +<% form_tag '../redeliver_incoming' do %> + <div> + id or url_title of request: + <%= text_field_tag 'url_title', "", { :size => 20 } %> + <%= hidden_field_tag 'redeliver_incoming_message_id', incoming_message.id %> + <%= submit_tag "Redeliver to another request" %> + </div> +<% end %> +<p> +<%= link_to 'FOI officer upload URL', '../generate_upload_url/' + incoming_message.info_request.id.to_s + "?incoming_message_id=" + incoming_message.id.to_s %> +</p> + diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index e6106655b..54b307cf9 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -86,31 +86,13 @@ <td><%=h incoming_message.send(column) %></td> <% end %> <td> - <% if !incoming_message.raw_email_id.nil? %> + <% if !incoming_message.raw_email_id.nil? %> <p> <%= link_to "View raw email", "../show_raw_email/" + incoming_message.raw_email_id.to_s %> </p> - <% end %> - - <% form_tag '../destroy_incoming' do %> - <div> - <%= hidden_field_tag 'incoming_message_id', incoming_message.id %> - <%= submit_tag "Destroy message" %> - </div> - <% end %> - - <% form_tag '../redeliver_incoming' do %> - <div> - id or url_title of request: - <%= text_field_tag 'url_title', "", { :size => 20 } %> - <%= hidden_field_tag 'redeliver_incoming_message_id', incoming_message.id %> - <%= submit_tag "Redeliver to another request" %> - </div> - <% end %> - <p> - <%= link_to 'FOI officer upload URL', '../generate_upload_url/' + @info_request.id.to_s + "?incoming_message_id=" + incoming_message.id.to_s %> - </p> + <% end %> + <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => incoming_message } %> </td> </tr> <% end %> diff --git a/app/views/admin_request/show_raw_email.rhtml b/app/views/admin_request/show_raw_email.rhtml index 883b10c37..70054156a 100644 --- a/app/views/admin_request/show_raw_email.rhtml +++ b/app/views/admin_request/show_raw_email.rhtml @@ -1,6 +1,14 @@ -<% @title = 'Raw email for incoming message ' + @raw_email.incoming_message.id.to_s + ' of FOI request \'' + h(@raw_email.incoming_message.info_request.title) + "'" %> +<% @title = 'Incoming message ' + @raw_email.incoming_message.id.to_s + ' of FOI request \'' + h(@raw_email.incoming_message.info_request.title) + "'" %> <h1><%=@title%></h1> +<h2>Actions</h2> + +<div> + <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => @raw_email.incoming_message } %> +</div> + +<h2>Raw email</h2> + <pre><%=h(@raw_email.data).gsub!(/\n/, '<br>') %></pre> |