From 9944acc5a675f234ac43df3087c4be4923901f1b Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Wed, 16 Sep 2009 14:56:04 -0300 Subject: [PATCH] ActionItem1225: changing name of method --- app/controllers/public/search_controller.rb | 2 +- app/models/environment.rb | 2 +- test/unit/environment_test.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index 590ccba..c7c5e02 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -221,7 +221,7 @@ class SearchController < PublicController def tags @tags_cache_key = "tags_env_#{environment.id.to_s}" if is_cache_expired?(@tags_cache_key, true) - @tags = environment.tags_count + @tags = environment.tag_counts end end diff --git a/app/models/environment.rb b/app/models/environment.rb index 0618c65..71d095a 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -534,7 +534,7 @@ class Environment < ActiveRecord::Base has_many :tags, :through => :articles - def tags_count + def tag_counts options = Article.find_options_for_tag_counts.merge(:conditions => ['profiles.environment_id = ?', self.id]) options[:joins] = options[:joins] + ' LEFT OUTER JOIN profiles on profiles.id = articles.profile_id' Tag.find(:all, options).inject({}) do |memo,tag| diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb index 5c8671c..447fa57 100644 --- a/test/unit/environment_test.rb +++ b/test/unit/environment_test.rb @@ -811,7 +811,7 @@ class EnvironmentTest < Test::Unit::TestCase user.articles.build(:name => 'article 2', :tag_list => 'first-tag, second-tag').save! user.articles.build(:name => 'article 3', :tag_list => 'first-tag, second-tag, third-tag').save! - assert_equal({ 'first-tag' => 3, 'second-tag' => 2, 'third-tag' => 1 }, Environment.default.tags_count) + assert_equal({ 'first-tag' => 3, 'second-tag' => 2, 'third-tag' => 1 }, Environment.default.tag_counts) end should 'not list tags count from other environment' do @@ -819,7 +819,7 @@ class EnvironmentTest < Test::Unit::TestCase user = create_user('testinguser', :environment => e).person user.articles.build(:name => 'article 1', :tag_list => 'first-tag').save! - assert_equal({}, Environment.default.tags_count) + assert_equal({}, Environment.default.tag_counts) end end -- libgit2 0.21.2