diff options
| -rw-r--r-- | app/controllers/general_controller.rb | 27 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 12 |
2 files changed, 26 insertions, 13 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 03a5c6884..fd557e3bd 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.50 2009-07-14 23:30:37 francis Exp $ +# $Id: general_controller.rb,v 1.51 2009-09-03 23:15:51 francis Exp $ class GeneralController < ApplicationController @@ -15,19 +15,28 @@ class GeneralController < ApplicationController #@popular_bodies = PublicBody.find(:all, :select => "*, (select count(*) from info_requests where info_requests.public_body_id = public_bodies.id) as c", :order => "c desc", :limit => 32) # Just hardcode some popular authorities for now - @popular_bodies = PublicBody.find(:all, :conditions => ["url_name in ('bbc', 'dwp', 'dh', 'local_government_ombudsmen', 'royal_mail_group', 'mod', 'lambeth_borough_council', 'edinburgh_council')"]) - - # This is too slow - #@random_requests = InfoRequest.find(:all, :order => "random()", :limit => 8, :conditions => ["described_state = ? and prominence = ?", 'successful', 'normal'] ) - - # Get some successful requests + # ('tgq' is for debugging on Francis's development environment) + @popular_bodies = PublicBody.find(:all, :conditions => ["url_name in ( + 'bbc', + 'dwp', + 'dh', + 'snh', + 'royal_mail_group', + 'mod', + 'kent_county_council', + 'wirral_borough_council' + /* ,'tgq' */ + )"]) + + # Get some successful requests # begin query = 'variety:response (status:successful OR status:partially_successful)' + #query = 'variety:response' # XXX debug sortby = "described" @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8) - @successful_requests = @xapian_object.results.map { |r| r[:model].info_request } + @successful_request_events = @xapian_object.results.map { |r| r[:model] } rescue - @successful_requests = [] + @successful_request_events = [] end cache_in_squid diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index e0b1f75cf..68c815a52 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -27,7 +27,9 @@ <div id="examples_0"> <ul> <% for popular_body in @popular_bodies %> - <li><%=public_body_link(popular_body)%> </li> + <li><%=public_body_link(popular_body)%> + <%=h popular_body.info_requests.count%> requests + </li> <% end%> </ul> <p><strong> @@ -36,11 +38,13 @@ </div> <% end %> - <% if @successful_requests.size > 0 %> + <% if @successful_request_events.size > 0 %> <div id="examples_1"> <ul> - <% for request in @successful_requests %> - <li><%=link_to h(excerpt(request.title, "", 35)), request_url(request)%> </li> + <% for event in @successful_request_events %> + <li><%=link_to h(excerpt(event.info_request.title, "", 35)), request_url(event.info_request)%> + <%=h time_ago_in_words(event.described_at)%> ago + </li> <% end %> </ul> <p><strong><a href="/list/successful">More successful requests...</a></strong></p> |