diff options
| -rw-r--r-- | app/controllers/general_controller.rb | 8 | ||||
| -rw-r--r-- | app/models/info_request.rb | 25 | ||||
| -rw-r--r-- | config/routes.rb | 5 |
3 files changed, 33 insertions, 5 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 5c1f9590a..44c2507ec 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -5,7 +5,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: general_controller.rb,v 1.56 2009-10-02 23:44:45 francis Exp $ +# $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $ require 'xmlsimple' require 'open-uri' @@ -138,6 +138,12 @@ class GeneralController < ApplicationController @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss] } ] end + # Jump to a random request + def random_request + info_request = InfoRequest.random + redirect_to request_url(info_request) + end + # For debugging def fai_test sleep 10 diff --git a/app/models/info_request.rb b/app/models/info_request.rb index e66501667..fd49e48d8 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -24,7 +24,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.210 2009-10-03 01:22:30 francis Exp $ +# $Id: info_request.rb,v 1.211 2009-10-03 10:23:44 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -431,7 +431,7 @@ public # states which require administrator action (hence email administrators # when they are entered, and offer state change dialog to them) - def self.requires_admin_states + def InfoRequest.requires_admin_states return ['requires_admin', 'error_message'] end @@ -867,12 +867,31 @@ public end # This is called from cron regularly. - def self.stop_new_responses_on_old_requests + def InfoRequest.stop_new_responses_on_old_requests # 6 months since last change to request, only allow new incoming messages from authority domains InfoRequest.update_all "allow_new_responses_from = 'authority_only' where updated_at < (now() - interval '6 months') and allow_new_responses_from = 'anybody'" # 1 year since last change requests, don't allow any new incoming messages InfoRequest.update_all "allow_new_responses_from = 'nobody' where updated_at < (now() - interval '1 year') and allow_new_responses_from in ('anybody', 'authority_only')" end + + # Returns a random FOI request + def InfoRequest.random + max_id = InfoRequest.connection.execute('select max(id) from info_requests')[0]['max'].to_i + info_request = nil + count = 0 + while info_request.nil?: + if count > 100 + return nil + end + id = rand(max_id) + 1 + begin + count += 1 + info_request = find(id, :conditions => ["prominence = 'normal'"]) + rescue ActiveRecord::RecordNotFound + end + end + return info_request + end end diff --git a/config/routes.rb b/config/routes.rb index fb363a419..832b3199e 100644 --- a/config/routes.rb +++ b/config/routes.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: routes.rb,v 1.90 2009-09-09 23:52:06 francis Exp $ +# $Id: routes.rb,v 1.91 2009-10-03 10:23:44 francis Exp $ ActionController::Routing::Routes.draw do |map| @@ -25,6 +25,8 @@ ActionController::Routing::Routes.draw do |map| # out in the controller. general.search_general '/search/*combined', :action => 'search' + general.random_request '/random', :action => 'random_request' + general.fai_test '/test', :action => 'fai_test' end @@ -46,6 +48,7 @@ ActionController::Routing::Routes.draw do |map| request.info_request_event '/request_event/:info_request_event_id', :action => 'show_request_event' request.upload_response "/upload/request/:url_title", :action => 'upload_response' + end map.with_options :controller => 'user' do |user| |