aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorfrancis <francis>2008-03-21 14:04:29 +0000
committerfrancis <francis>2008-03-21 14:04:29 +0000
commit426be7f2c0eb5cf09bb35bb9d40c67b7af59d7ec (patch)
treeb56287fef663664cfdabbe9d17a6acc41eeb3396 /app/views
parent6c7353d8b494c2b5c83d725be68fba6b5b5c517d (diff)
Get rid of special envelope from -bounce addresses, as they are no good since
enough public authorities mail them with non-automatic messages.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin_request/show.rhtml1
-rw-r--r--app/views/request/_correspondence.rhtml7
2 files changed, 1 insertions, 7 deletions
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index 2556513e6..f9fb4ce45 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -10,7 +10,6 @@
<strong>Created by:</strong> <%= user_admin_link(@info_request.user) %> <br>
<strong>Public body:</strong> <%= public_body_admin_link(@info_request.public_body) %> <br>
<strong>Incoming email address:</strong> <%=h @info_request.incoming_email %> <br>
-<strong>Envelope email address:</strong> <%=h @info_request.envelope_email %> <br>
</p>
<p>
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index 3bb823fa1..8f91631f2 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -18,12 +18,7 @@ if not incoming_message.nil?
<% if !incoming_message.safe_mail_from.nil? %>
<%= incoming_message.safe_mail_from %> of
<% end %>
- <%= public_body_link(@info_request.public_body) %>
- <% if incoming_message.is_bounce %>
- replied automatically
- <% else %>
- replied
- <% end %>
+ <%= public_body_link(@info_request.public_body) %> replied
(<%= link_to "link to this", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) %>,
<%= link_to "reply", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#show_response_followup" %>)
</p>