diff options
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 17 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 11 | ||||
| -rw-r--r-- | todo.txt | 10 |
3 files changed, 32 insertions, 6 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 33b04e7fe..153d5eb75 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_request_controller.rb,v 1.30 2009-03-10 12:04:55 tony Exp $ +# $Id: admin_request_controller.rb,v 1.31 2009-04-02 11:25:43 francis Exp $ class AdminRequestController < AdminController def index @@ -244,6 +244,21 @@ class AdminRequestController < AdminController render :text => @raw_email.data end + # used so due dates get fixed + def mark_event_as_clarification + info_request_event = InfoRequestEvent.find(params[:info_request_event_id]) + if info_request_event.event_type != 'response' + raise Exception("can only mark responses as requires clarification") + end + info_request_event.described_state = 'waiting_clarification' + info_request_event.calculated_state = 'waiting_clarification' + # XXX deliberately don't update described_at so doesn't reenter search? + info_request_event.save! + + flash[:notice] = "Old response marked as having been a clarification" + redirect_to request_admin_url(info_request_event.info_request) + end + private end diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index ddab744e9..84d54b579 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -27,6 +27,7 @@ <% for column in InfoRequestEvent.content_columns %> <th><%= column.human_name %></th> <% end %> + <th>Actions</th> </tr> <% for info_request_event in @info_request.info_request_events.find(:all, :order => "created_at, id") %> @@ -43,6 +44,16 @@ <% end %> </td> <% end %> + <td> + <% if info_request_event.described_state != 'waiting_clarification' and info_request_event.event_type == 'response' %> + <% form_tag '../mark_event_as_clarification' do %> + <div> + <%= hidden_field_tag 'info_request_event_id', info_request_event.id %> + <%= submit_tag "Was clarification request" %> + </div> + <% end %> + <% end %> + </td> </tr> <% end %> </table> @@ -6,6 +6,8 @@ Check #email_subscriptions in unsubscribe link Change text so that overdue covers qualified exemption of public interest test being valid reason for delay. +Allow admin override of overdue dates - probably an interface to let people set +waiting clarification. Or maybe allow full override of due date. When moving request: ActionView::TemplateError (undefined method `info_request' for nil:NilClass) on line #34 of request/show.rhtml: @@ -63,10 +65,9 @@ check-recent-requests-sent probably doesn't work, as exim log lines wouldn't be load in case where the envelope from gets broken? Lots of authorities are starting to complain about how their record looks on -their page - e.g responses not classified by users, the sort of icon there is -for information not held etc. That users may classify incorrectly. We need -some kidn of general solution to make it clear what the states and icons mean, -in terms of properly reflecting how the council is doing. +their page - e.g responses not classified by users. That users may classify +incorrectly. We need some kidn of general solution to make it clear what the +states mean, in terms of properly reflecting how the council is doing. Add FAQ / unhappy page which explains what you can do if you get no response at all and that it might be spam. (err, or somehow reorganise FAQ for this @@ -156,7 +157,6 @@ using the internal review mode. CSS / design things - The stepwise instruction boxes "Next, select the public authority ... " need to look better, and have icons associated with them etc. - - Icon for internal_review, user_withdrawn - CSS error on "all councils" page on some browsers https://bugzilla.mozilla.org/show_bug.cgi?id=424194 - Spacing on error boxes round form elements. Matthew says: |