diff options
| author | francis <francis> | 2009-08-26 00:58:29 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-08-26 00:58:29 +0000 |
| commit | 3bd84cd6a8720a5c4a1ce74be01bae86449c1cc6 (patch) | |
| tree | 665f6cf7d6349a89774f9648773a2816d59864ad /app/controllers/admin_public_body_controller.rb | |
| parent | 301d10958f8ce43a4eb948d4b00f5a2a931969c2 (diff) | |
Show correctly what happens with pagination when mass adding tags.
Keep page number are on when mass adding tags.
Display count of number of matches.
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 8f51a4cfb..74a3a86c6 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_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_public_body_controller.rb,v 1.22 2009-08-26 00:45:38 francis Exp $ +# $Id: admin_public_body_controller.rb,v 1.23 2009-08-26 00:58:29 francis Exp $ class AdminPublicBodyController < AdminController def index @@ -17,7 +17,11 @@ class AdminPublicBodyController < AdminController if @query == "" @query = nil end - @public_bodies = PublicBody.paginate :order => "name", :page => params[:page], :per_page => 100, + @page = params[:page] + if @page == "" + @page = nil + end + @public_bodies = PublicBody.paginate :order => "name", :page => @page, :per_page => 100, :conditions => @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or lower(short_name) like lower('%'||?||'%') or lower(request_email) like lower('%'||?||'%')", @query, @query, @query] @@ -45,7 +49,7 @@ class AdminPublicBodyController < AdminController flash[:notice] = "Added tag to table of bodies." end - redirect_to admin_url('body/list') + "?query=" + @query # XXX construct this URL properly + redirect_to admin_url('body/list') + "?query=" + @query + (@page.nil? ? "" : "&page=" + @page) # XXX construct this URL properly end def missing_scheme |