diff options
| author | David Cabo <david@calibea.com> | 2011-09-19 11:24:19 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-09-19 11:26:37 +0200 |
| commit | f8d7daaad3ff7f62d8dd0f7ecec7a8a11dc4addc (patch) | |
| tree | 4c3f4be4e072ab2b3302ffd9ff1d9ecfe28ed640 /app/controllers/public_body_controller.rb | |
| parent | 73ceb164768f4ae9d0b7c77e6b6ebd746421efc3 (diff) | |
Wrap categories loading into singleton and add support for multiple locales simultaneously. Fixes #178
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 79ca58d13..e4f8753af 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -99,7 +99,7 @@ class PublicBodyController < ApplicationController @tag = "all" conditions = [locale_condition, @query, @query, @locale] elsif @tag == 'other' - category_list = PublicBodyCategories::CATEGORIES.map{|c| "'"+c+"'"}.join(",") + category_list = PublicBodyCategories::get().tags().map{|c| "'"+c+"'"}.join(",") conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' and has_tag_string_tags.name in (' + category_list + ')) = 0', @query, @query, @locale] @@ -121,7 +121,7 @@ class PublicBodyController < ApplicationController elsif @tag.size == 1 @description = _("beginning with") + " '" + @tag + "'" else - @description = PublicBodyCategories::CATEGORIES_BY_TAG[@tag] + @description = PublicBodyCategories::get().by_tag()[@tag] if @description.nil? @description = @tag end |