diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 18 | ||||
| -rw-r--r-- | app/views/request/new_please_describe.rhtml | 25 | ||||
| -rw-r--r-- | todo.txt | 16 |
3 files changed, 45 insertions, 14 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index d00934e0b..7f0c500d2 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/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: request_controller.rb,v 1.109 2008-09-22 02:36:03 francis Exp $ +# $Id: request_controller.rb,v 1.110 2008-09-22 03:02:03 francis Exp $ class RequestController < ApplicationController @@ -85,8 +85,22 @@ class RequestController < ApplicationController # Page new form posts to def new + # If we've just got here (so no writing to lose), and we're already + # logged in, force the user to describe any undescribed requests. Allow + # margin of 1 undescribed so it isn't too annoying - the function + # get_undescribed_requests also allows one day since the response + # arrived. + if !@user.nil? && params[:submitted_new_request].nil? + @undescribed_requests = @user.get_undescribed_requests + @public_body = PublicBody.find(params[:public_body_id]) + if @undescribed_requests.size > 1 + render :action => 'new_please_describe' + return + end + end + # First time we get to the page, just display it - if params[:submitted_new_request].nil? or params[:reedit] + if params[:submitted_new_request].nil? || params[:reedit] # Read parameters in - public body must be passed in if params[:public_body_id] params[:info_request] = { :public_body_id => params[:public_body_id] } diff --git a/app/views/request/new_please_describe.rhtml b/app/views/request/new_please_describe.rhtml new file mode 100644 index 000000000..d88944910 --- /dev/null +++ b/app/views/request/new_please_describe.rhtml @@ -0,0 +1,25 @@ +<% @title = "First, did your other requests succeed?" %> + +<h1><%=@title%></h1> + +<p>Please select each of these requests in turn, and <strong>let everyone know</strong> +if they are successful yet or not. +</p> + +<ul> +<% for undescribed_request in @undescribed_requests %> + <li><%=request_link(undescribed_request)%></li> +<% end %> +</ul> + +<p> + When you're done, <strong>come back here</strong>, + <%= link_to "reload this page", new_request_to_body_url(:public_body_id => @public_body.id.to_s) %> + and file your new request. +</p> + +<p> + Thanks very much for helping keep everything <strong>neat and organised</strong>. + We'll also, if you need it, give you advice on what to do next about each of your + requests. +</p> @@ -11,19 +11,16 @@ Check foi backup Next ==== -Simple initial bulk request prevention (see Tony's mail on this) This doesn't work: http://www.whatdotheyknow.com/search/status:waiting_classification/ -Don't let somebody file a new request if they haven't classified all existing ones? - - nobody will logout and reconfirm email for each one, so can just make it - "can't file while already logged in"? - - and *after* filing get them to go classify existing ones - -Put name at bottom of request if you are signed in (so don't send them in others names!) Maybe move "send followup" into actions? and make it so you can choose who to send followup to from dropdown Maybe make it so you need to log in to send follow up (i.e. before) +When forcing auth user for followups is a bit confusing/weird, does it really work? + Perhaps remove signout dialog and have signin instead? + Should we say auth for followups sooner as you have to be certain user? +Display of login dialog to log in as particular user if you are logged out isn't centred nicely Internal review status/marker? http://www.whatdotheyknow.com/request/search_engine_advertising_bought @@ -54,11 +51,6 @@ When they say "successful", encourage them to make an annotation? Clear out all the need admin attention requests -When forcing auth user for followups is a bit confusing/weird, does it really work? - Perhaps remove signout dialog and have signin instead? - Should we say auth for followups sooner as you have to be certain user? -Display of login dialog to log in as particular user if you are logged out isn't centred nicely - "Excessive use of speed by Police vehicles." appears only once, even though multiple annotations. Perhaps show grouping count? http://www.whatdotheyknow.com/search/variety:comment/newest |