Download as
Browse Code »

Commit e2a437f724e89de22fa4257ef588ed24f4021cee

Authored by Antonio Terceiro
1 parent 75a35fb9
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem1026: ask the environment for its tags

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @e2a437f
@@ -209,14 +209,14 @@ class SearchController < PublicController @@ -209,14 +209,14 @@ class SearchController < PublicController
209 attr_reader :category 209 attr_reader :category
210 210
211 def tags 211 def tags
212 - @tags = Tag.find(:all).inject({}) do |memo,tag| 212 + @tags = environment.tags.inject({}) do |memo,tag|
213 memo[tag.name] = tag.taggings.count 213 memo[tag.name] = tag.taggings.count
214 memo 214 memo
215 end 215 end
216 end 216 end
217 217
218 def tag 218 def tag
219 - @tag = Tag.find_by_name(params[:tag]) 219 + @tag = environment.tags.find_by_name(params[:tag])
220 @tagged = @tag.taggings.map(&:taggable) 220 @tagged = @tag.taggings.map(&:taggable)
221 end 221 end
222 222
app/models/environment.rb
  Diff comments   View file @e2a437f
@@ -444,6 +444,8 @@ class Environment < ActiveRecord::Base @@ -444,6 +444,8 @@ class Environment < ActiveRecord::Base
444 444
445 has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 445 has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
446 446
  447 + has_many :tags, :through => :articles
  448 +
447 def theme 449 def theme
448 self[:theme] || 'default' 450 self[:theme] || 'default'
449 end 451 end