diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-23 21:53:10 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-23 21:53:10 +0000 |
| commit | 0e546a79b205124d7b95b89e4a2e9cc520a4fc10 (patch) | |
| tree | 791ae964c0dd4aba79cc9a3a6537db49c594cedf /app/controllers/general_controller.rb | |
| parent | 2c97a42455edb338a4ffeb529c9dd08bdf2864e0 (diff) | |
| parent | 000a4b3bc2858124301eb36553b018266cfe2cae (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index d28f4deec..c715b547d 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -32,12 +32,12 @@ class GeneralController < ApplicationController if body_short_names.empty? # This is too slow @popular_bodies = PublicBody.find(:all, - :select => "public_bodies.*, (select count(*) from info_requests where info_requests.public_body_id = public_bodies.id) as c", - :order => "c desc", - :limit => 32, - :conditions => conditions, - :joins => :translations - ) + :select => "public_bodies.*, (select count(*) from info_requests where info_requests.public_body_id = public_bodies.id) as c", + :order => "c desc", + :limit => 32, + :conditions => conditions, + :joins => :translations + ) else conditions[0] += " and public_bodies.url_name in (" + body_short_names + ")" @popular_bodies = PublicBody.find(:all, |