diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-09 09:07:20 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-09 09:07:20 +0100 |
| commit | b0181d36715c4e5258803c735b72a809b0f254a9 (patch) | |
| tree | f7f496910e93213692b0ac295c08811ec03d1360 /app/controllers/public_body_controller.rb | |
| parent | a9c7286807dca10872b5c659c216e1e2a754e9c3 (diff) | |
| parent | e1d38525ae985d268a5d5478ed8122c5a5b19871 (diff) | |
Merge origin/develop into local develop (including Nick's design changes)
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 0e58b7055..79ca58d13 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -91,7 +91,10 @@ class PublicBodyController < ApplicationController @tag = params[:tag] @locale = self.locale_from_params() - locale_condition = "(upper(public_body_translations.name) LIKE upper(?) OR upper(public_body_translations.notes) LIKE upper (?)) AND public_body_translations.locale = ?" + locale_condition = "(upper(public_body_translations.name) LIKE upper(?) + OR upper(public_body_translations.notes) LIKE upper (?)) + AND public_body_translations.locale = ? + AND public_bodies.id <> #{PublicBody.internal_admin_body.id}" if @tag.nil? or @tag == "all" @tag = "all" conditions = [locale_condition, @query, @query, @locale] @@ -123,7 +126,7 @@ class PublicBodyController < ApplicationController @description = @tag end end - PublicBody.with_locale(@locale) do + 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 :conditions => conditions, |