Download as
Browse Code »

Commit e2a437f724e89de22fa4257ef588ed24f4021cee

Authored by Antonio Terceiro
1 parent 75a35fb9
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 209 attr_reader :category
210 210  
211 211 def tags
212   - @tags = Tag.find(:all).inject({}) do |memo,tag|
  212 + @tags = environment.tags.inject({}) do |memo,tag|
213 213 memo[tag.name] = tag.taggings.count
214 214 memo
215 215 end
216 216 end
217 217  
218 218 def tag
219   - @tag = Tag.find_by_name(params[:tag])
  219 + @tag = environment.tags.find_by_name(params[:tag])
220 220 @tagged = @tag.taggings.map(&:taggable)
221 221 end
222 222  
... ...
app/models/environment.rb
  Diff comments   View file @e2a437f
... ... @@ -444,6 +444,8 @@ class Environment < ActiveRecord::Base
444 444  
445 445 has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
446 446  
  447 + has_many :tags, :through => :articles
  448 +
447 449 def theme
448 450 self[:theme] || 'default'
449 451 end
... ...