diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
| commit | 050b25bd70909913b7e42d53cb69c31b1396cc46 (patch) | |
| tree | ac2f2b587ffa3504c5cf5164b36f5f436c0582f4 /app/controllers/public_body_controller.rb | |
| parent | 4db18138584b6394286bbe374f22e6609ab79136 (diff) | |
| parent | e30a8623a1706d3bad4476198085547d8f47cc88 (diff) | |
Merge branch 'release/0.11' into wdtk
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 1821e6725..74ea043bb 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -3,7 +3,7 @@ # Show information about a public body. # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ +# Email: hello@mysociety.org; WWW: http://www.mysociety.org/ require 'fastercsv' @@ -128,10 +128,8 @@ class PublicBodyController < ApplicationController end end I18n.with_locale(@locale) do - @public_bodies = PublicBody.paginate( - :order => "public_body_translations.name", :page => params[:page], :per_page => 100, - :conditions => conditions, - :joins => :translations + @public_bodies = PublicBody.where(conditions).joins(:translations).order("public_body_translations.name").paginate( + :page => params[:page], :per_page => 100 ) render :template => "public_body/list" end |