diff options
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/admin_general/index.rhtml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index bcfd11e03..8c035d6e4 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.5 2009-04-08 16:13:11 louise Exp $ +# $Id: admin_general_controller.rb,v 1.6 2009-06-05 05:53:25 francis Exp $ class AdminGeneralController < AdminController def index @@ -19,7 +19,7 @@ class AdminGeneralController < AdminController @requires_admin_requests = InfoRequest.find(:all, :select => '*, ' + InfoRequest.last_event_time_clause + ' as last_event_time', :conditions => ["described_state = 'requires_admin'"], :order => "last_event_time") @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") - @ten_days_old_unclassified = InfoRequest.find_old_unclassified(:limit => 50, + @old_unclassified = InfoRequest.find_old_unclassified(:limit => 50, :conditions => ["prominence != 'backpage'"], :age_in_days => 10) @holding_pen_messages = InfoRequest.holding_pen_request.incoming_messages diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index 636a36c48..4ff3a58c6 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -32,11 +32,11 @@ <% end %> -<% if @ten_days_old_unclassified.size > 0 %> +<% if @old_unclassified.size > 0 %> <h3>Classify responses that are still unclassified ten days after response</h3> <ul> - <% for @request in @ten_days_old_unclassified %> + <% for @request in @old_unclassified %> <li> <%= request_both_links(@request) %> – <%=simple_date(@request.get_last_response_event.created_at)%> @@ -85,7 +85,7 @@ </ul> <% end %> -<% if @holding_pen_messages.size == 0 && @ten_days_old_unclassified.size == 0 && @requires_admin_requests.size == 0 && @blank_contacts.size == 0 %> +<% if @holding_pen_messages.size == 0 && @old_unclassified.size == 0 && @requires_admin_requests.size == 0 && @blank_contacts.size == 0 %> <p>No pending administration required.</p> <% end %> |