aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/public_body/view_email.rhtml25
-rw-r--r--todo.txt10
2 files changed, 28 insertions, 7 deletions
diff --git a/app/views/public_body/view_email.rhtml b/app/views/public_body/view_email.rhtml
index 9c61ff0fa..47cfe0da8 100644
--- a/app/views/public_body/view_email.rhtml
+++ b/app/views/public_body/view_email.rhtml
@@ -3,11 +3,34 @@
<h1>FOI email address for '<%=public_body_link(@public_body)%>'</h1>
<p>
+<% if @public_body.is_requestable? %>
WhatDoTheyKnow sends new requests to <strong><%=h @public_body.request_email%></strong> for this authority.
+<% else %>
+ <% if @public_body.not_requestable_reason == 'not_apply' %>
+ <p>Freedom of Information law no longer applies to this authority.
+ Follow up messages to existing requests are sent to <strong><%=h @public_body.request_email%></strong>.
+ </p>
+ <% elsif @public_body.not_requestable_reason == 'defunct' %>
+ <p><%=h @public_body.name %> no longer exists.
+ Follow up messages to existing requests are sent to <strong><%=h @public_body.request_email%></strong>.
+ </p>
+ <% elsif @public_body.not_requestable_reason == 'bad_contact' %>
+ <p>We do not have a working request email address for this authority.
+ </p>
+ <% else %>
+ <% raise "unknown reason " + @reason %>
+ <% end %>
+
+<% end %>
</p>
<p>
- If the address is wrong, or you know a better address, please <a href="/help/contact">contact us</a>.
+ <% if @public_body.is_requestable? || @public_body.not_requestable_reason != 'bad_contact' %>
+ If the address is wrong, or you know a better address, please <a href="/help/contact">contact us</a>.
+ <% else %>
+ If you know the address to use, then please <a href="/help/contact">send it to us</a>.
+ You may be able to find the address on their website, or by phoning them up and asking.
+ <% end %>
</p>
<div id="stepwise_make_request_view_email">
diff --git a/todo.txt b/todo.txt
index b7b9c6a58..ca95cb712 100644
--- a/todo.txt
+++ b/todo.txt
@@ -13,6 +13,10 @@ Next (things that will reduce admin time mainly)
Factor out "defunct/not_apply" from request_email into own field so defunct
authorities can still have followups to existing requests. Probably into tags.
+* When you do follow up to authority that is defunct/not_apply explain this
+http://www.whatdotheyknow.com/request/14960/response/39838#followup
+* Fix up text when you send follow up and it no longer exists
+http://www.whatdotheyknow.com/request/14960/response#followup
Have proper house rules / site terms and conditions page.
Perhaps borrow from these house rules:
@@ -285,12 +289,6 @@ Edits to outgoing/incoming/title won't be reindexed in Xapian (maybe just reinde
This does it all:
$ ./script/clear-incoming-text-cache ; ./script/rebuild-xapian-index
-Remove request email address from PDFs (we already do from docs, and we run censor rules on PDFs now)
- http://www.whatdotheyknow.com/request/cost_of_policing_the_oxford_unio_3
- http://www.whatdotheyknow.com/request/5353/response/11911/attach/html/2/Freedom%20of%20Information%20-%20Letter%20Accepting%20Request%20-%2072057594037995214.pdf.html
-Take care here, sometimes emails are found by spammers by Google's OCR of
-images in PDFs
-
Renaming public authorities will break alerts on them. For basic alerts the
structured info is there so this should just be fixed. For searches, perhaps
Xapian index should search url_name history as well?