diff options
author | David Cabo <david@calibea.com> | 2011-09-03 15:00:41 +0200 |
---|---|---|
committer | David Cabo <david@calibea.com> | 2011-09-03 15:00:41 +0200 |
commit | aebe196100a231873099744ec33d1e4c7dc0934a (patch) | |
tree | 79ea3ea950e762d120bba34b7c1346db07bc513d /app/controllers/public_body_controller.rb | |
parent | 1741094c4ff2f8592e5be5c09ee914f37b39039e (diff) | |
parent | 204e5c3a739a2bedf927b2f6aa82c373731bbda8 (diff) |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'app/controllers/public_body_controller.rb')
-rw-r--r-- | app/controllers/public_body_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 77cede36b..0e58b7055 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -90,6 +90,7 @@ class PublicBodyController < ApplicationController @query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%" @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 = ?" if @tag.nil? or @tag == "all" @tag = "all" |