diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-27 00:31:59 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-27 00:31:59 +0000 |
| commit | 4782d614fa4fbed323c66da4a854ca8182f42fb5 (patch) | |
| tree | 52eab973e9695bf6c7fc8e07bb11434dc1a3c900 /app/controllers/admin_public_body_controller.rb | |
| parent | 8da0080e42076ed5ac0a866a7dde180a9167bdc9 (diff) | |
| parent | 0b82a80ae60afad0f43b4b60e5ce984ffb9ea8eb (diff) | |
Merge branch 'wdtk' into release/0.5
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 0c24d47c1..c6904da95 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -27,7 +27,7 @@ class AdminPublicBodyController < AdminController end @public_bodies = PublicBody.paginate :order => "public_body_translations.name", :page => @page, :per_page => 100, :conditions => @query.nil? ? "public_body_translations.locale = '#{@locale}'" : - ["(lower(public_body_translations.name) like lower('%'||?||'%') or + ["(lower(public_body_translations.name) like lower('%'||?||'%') or lower(public_body_translations.short_name) like lower('%'||?||'%') or lower(public_body_translations.request_email) like lower('%'||?||'%' )) AND (public_body_translations.locale = '#{@locale}')", @query, @query, @query], :joins => :translations |