Convert query to more activerecord 3 form

1 files changed, 2 insertions, 4 deletions

diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index 5265706bf..88ed5c246 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -130,10 +130,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).paginate(
+              :order => "public_body_translations.name", :page => params[:page], :per_page => 100
             )
             render :template => "public_body/list"
         end