diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/request_controller.rb | 9 | ||||
| -rw-r--r-- | app/controllers/user_controller.rb | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index fe4904db7..83b6e96ef 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.107 2008-09-12 19:07:28 francis Exp $ +# $Id: request_controller.rb,v 1.108 2008-09-14 01:40:29 francis Exp $ class RequestController < ApplicationController @@ -53,6 +53,12 @@ class RequestController < ApplicationController # doing so. Google bot was going dozens of pages in, and they are slow # pages to generate, having an impact on server load. @no_crawl = true + + if (@page > 1) + @page_desc = " (page " + @page.to_s + ")" + else + @page_desc = "" + end end def list @@ -72,6 +78,7 @@ class RequestController < ApplicationController raise "unknown request list view " + @view.to_s end @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') + @title = @title + " (page " + @page.to_s + ")" if (@page > 1) @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss] } ] end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 2c98bfd7d..a194b4f36 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_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: user_controller.rb,v 1.56 2008-09-08 16:38:32 francis Exp $ +# $Id: user_controller.rb,v 1.57 2008-09-14 01:40:29 francis Exp $ class UserController < ApplicationController # Show page about a user @@ -25,6 +25,7 @@ class UserController < ApplicationController # Use search query for this so can collapse and paginate easily @xapian_requests = perform_search([InfoRequestEvent], 'requested_by:' + @display_user.url_name, 'newest', 'request_collapse') @xapian_comments = perform_search([InfoRequestEvent], 'commented_by:' + @display_user.url_name, 'newest', nil) + @page_desc = " (page " + @page.to_s + ")" # Track corresponding to this page @track_thing = TrackThing.create_track_for_user(@display_user) |