diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:20:32 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:20:32 +0000 |
| commit | ddd86f6f41c740748f8a867022a89179c587ca30 (patch) | |
| tree | 7ee2982cf92b40e8527704ec1f7573cc99ae31ea /app/controllers/public_body_controller.rb | |
| parent | 38e30c682504e8cd5ace61f2fc937d100eae3c65 (diff) | |
| parent | 766d696d5b914520b0b9367e9b9a9decab87ea5f (diff) | |
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 62229a441..c31134641 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -129,7 +129,7 @@ class PublicBodyController < ApplicationController end PublicBody.with_locale(@locale) do @public_bodies = PublicBody.paginate( - :order => "public_body_translations.name", :page => params[:page], :per_page => 1000, # fit all councils on one page + :order => "public_body_translations.name", :page => params[:page], :per_page => 100, :conditions => conditions, :joins => :translations ) |