diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-10-14 09:51:05 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-10-14 09:51:05 +0100 |
| commit | 55e0b9f75160222d07773f38c8aa67aa9de1487e (patch) | |
| tree | 5253e2e570c49b0c2f9b07027858c6f93798aae1 /app/controllers/public_body_controller.rb | |
| parent | c64360898beca1162a1bdef9ca4b76676e0907f8 (diff) | |
| parent | 5e1517acfc7b2c46523ca0657d67bdf53299826b (diff) | |
Merge branch 'issues/222-category-editing-add-order-interface' into rails-3-develop
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 d2c84d820..e64644a1b 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -111,7 +111,7 @@ class PublicBodyController < ApplicationController if @tag.nil? || @tag == 'all' @tag = 'all' elsif @tag == 'other' - category_list = PublicBodyCategories.get.tags.map{ |c| %Q('#{ c }') }.join(",") + category_list = PublicBodyCategory.get.tags.map{ |c| %Q('#{ c }') }.join(",") where_condition += base_tag_condition + " AND has_tag_string_tags.name in (#{category_list})) = 0" elsif @tag.scan(/./mu).size == 1 @tag = Unicode.upcase(@tag) @@ -132,7 +132,7 @@ class PublicBodyController < ApplicationController elsif @tag.size == 1 @description = _("beginning with ‘{{first_letter}}’", :first_letter => @tag) else - category_name = PublicBodyCategories.get.by_tag[@tag] + category_name = PublicBodyCategory.get.by_tag[@tag] if category_name.nil? @description = _("matching the tag ‘{{tag_name}}’", :tag_name => @tag) else |