diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin_general/index.rhtml | 15 | ||||
| -rw-r--r-- | app/views/admin_request/edit.rhtml | 1 | ||||
| -rw-r--r-- | app/views/comment/new.rhtml | 4 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 1 | ||||
| -rw-r--r-- | app/views/request/_describe_state.rhtml | 16 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 2 |
6 files changed, 35 insertions, 4 deletions
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index 7dce7373c..d15f619f1 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -45,8 +45,21 @@ </ul> <% end %> +<% if @error_message_requests.size > 0 %> + <h3>Fix these delivery and other errors (<%=@error_message_requests.size%> total)</h3> + + <ul> + <% for @request in @error_message_requests %> + <li> + <%= request_both_links(@request)%> + – <%=simple_date(@request.get_last_event.created_at)%> + </li> + <% end %> + </ul> +<% end %> + <% if @requires_admin_requests.size > 0 %> - <h3>Work out what to do with these unusual responses (a new category?) (<%=@requires_admin_requests.size%> total)</h3> + <h3>These require administrator attention (<%=@requires_admin_requests.size%> total)</h3> <ul> <% for @request in @requires_admin_requests %> diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml index d00ec2c4c..7374042f1 100644 --- a/app/views/admin_request/edit.rhtml +++ b/app/views/admin_request/edit.rhtml @@ -25,6 +25,7 @@ 'successful', 'partially_successful', 'internal_review', + 'error_message', 'requires_admin', 'user_withdrawn' ]) %> diff --git a/app/views/comment/new.rhtml b/app/views/comment/new.rhtml index a298b640a..faea07e30 100644 --- a/app/views/comment/new.rhtml +++ b/app/views/comment/new.rhtml @@ -51,10 +51,14 @@ Annotations are so anyone, including you, can help the requester with their requ <li> Advise on whether the <strong>rejection is legal</strong>, and how to complain about if not. </li> <% end %> +<% if [ 'error_message' ].include?(@info_request.described_state) %> + <li> You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address. </li> +<% end %> <% if [ 'requires_admin' ].include?(@info_request.described_state) %> <li> Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> should do about the request. </li> <% end %> + </ul> <p> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index ed2be514b..0a9dd3e5c 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -133,6 +133,7 @@ <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td> The public authority would like part of the request explained </td></tr> <tr><td><strong><%=search_link('status:gone_postal')%></strong></td><td> The public authority would like to / has responded by post </td></tr> <tr><td><strong><%=search_link('status:internal_review')%></strong></td><td> Waiting for the public authority to complete an internal review of their handling of the request</td></tr> + <tr><td><strong><%=search_link('status:error_message')%></strong></td><td> Received an error message, such as delivery failure.</td></tr> <tr><td><strong><%=search_link('status:requires_admin')%></strong></td><td> A strange reponse, required attention by the WhatDoTheyKnow team </td></tr> <tr><td><strong><%=search_link('status:user_withdrawn')%></strong></td><td> The requester has abandoned this request for some reason </td></tr> </table> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 15983eb78..d6e24c453 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -1,6 +1,6 @@ <% if @is_owning_user || @requires_admin_describe %> <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> - <h2>What is the status of this request now?</h2> + <h2>What best describes the status of this request now?</h2> <hr> <!------------------------------------------------> @@ -56,9 +56,19 @@ <hr> <!------------------------------------------------> <div> - <%= radio_button "incoming_message", "described_state", "requires_admin", :id => 'requires_admin' + id_suffix %> - <label for="requires_admin<%=id_suffix%>"><strong>None</strong> of the above</label> + <%= radio_button "incoming_message", "described_state", "error_message", :id => 'error_message' + id_suffix %> + <label for="error_message<%=id_suffix%>"> + I've received an <strong>error message</strong> + </label> </div> +<!-- <div> + <%= radio_button "incoming_message", "described_state", "requires_admin", :id => 'requires_admin' + id_suffix %> + <label for="requires_admin<%=id_suffix%>"> + <strong>None</strong> of the above + </label> + </div> --> + + <hr> <p> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 1993b77ce..4e001f9b8 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -109,6 +109,8 @@ The authority would like to / has <strong>responded by post</strong> to this request. <% elsif @status == 'internal_review' %> Waiting for an <strong>internal review</strong> by <%= public_body_link(@info_request.public_body) %> of their handling of this request. + <% elsif @status == 'error_message' %> + There was a <strong>delivery error</strong> or similar, which needs fixing by the WhatDoTheyKnow team. <% elsif @status == 'requires_admin' %> This request has had an unusual response, and <strong>requires attention</strong> from the WhatDoTheyKnow team. <% elsif @status == 'user_withdrawn' %> |