diff options
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/request_game_controller.rb | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index ec47ace0e..5073cdc5b 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_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_general_controller.rb,v 1.11 2009-10-01 00:20:56 francis Exp $ +# $Id: admin_general_controller.rb,v 1.12 2009-10-03 01:28:33 francis Exp $ class AdminGeneralController < AdminController def index @@ -25,8 +25,7 @@ class AdminGeneralController < AdminController @error_message_requests = InfoRequest.find(:all, :select => '*, ' + InfoRequest.last_event_time_clause + ' as last_event_time', :conditions => ["described_state = 'error_message'"], :order => "last_event_time") @blank_contacts = PublicBody.find(:all, :conditions => ["request_email = ''"], :order => "updated_at") @old_unclassified = InfoRequest.find_old_unclassified(:limit => 20, - :conditions => ["prominence = 'normal'"], - :age_in_days => 10) + :conditions => ["prominence = 'normal'"]) @holding_pen_messages = InfoRequest.holding_pen_request.incoming_messages end diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 4bb447f95..34f135e47 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.41 2009-09-09 00:19:20 francis Exp $ +# $Id: admin_request_controller.rb,v 1.42 2009-10-03 01:28:33 francis Exp $ class AdminRequestController < AdminController def index @@ -19,8 +19,7 @@ class AdminRequestController < AdminController end def list_old_unclassified - @info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"], - :age_in_days => 10) + @info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"]) end def show diff --git a/app/controllers/request_game_controller.rb b/app/controllers/request_game_controller.rb index 3abb9adf6..574388e21 100644 --- a/app/controllers/request_game_controller.rb +++ b/app/controllers/request_game_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_game_controller.rb,v 1.3 2009-08-26 23:13:28 francis Exp $ +# $Id: request_game_controller.rb,v 1.4 2009-10-03 01:28:33 francis Exp $ class RequestGameController < ApplicationController @@ -20,7 +20,7 @@ class RequestGameController < ApplicationController session[:request_game] = Time.now - old = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"], :age_in_days => 10) + old = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"]) @missing = old.size @requests = old.sort_by{ rand }.slice(0..2) |