Download as
Browse Code »

Commit 50ba75f56dadbe0e919c57cda43ca872ee9ae68a

Authored by AntonioTerceiro
1 parent b2005120
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

ActionItem405: removing comment searching stuff 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1907 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 0 additions and 63 deletions   Show diff stats
app/models/category_finder.rb
  Diff comments   View file @50ba75f
@@ -56,8 +56,6 @@ class CategoryFinder @@ -56,8 +56,6 @@ class CategoryFinder
56 56
57 def options_for_find(klass, options={}) 57 def options_for_find(klass, options={})
58 case klass.name 58 case klass.name
59 - when 'Comment'  
60 - {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?)', category_ids]}.merge!(options)  
61 when 'Product' 59 when 'Product'
62 {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?)', category_ids]}.merge!(options) 60 {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?)', category_ids]}.merge!(options)
63 when 'Article', 'Person', 'Community', 'Enterprise', 'Event' 61 when 'Article', 'Person', 'Community', 'Enterprise', 'Event'
@@ -70,8 +68,6 @@ class CategoryFinder @@ -70,8 +68,6 @@ class CategoryFinder
70 def options_for_find_by_initial(klass, initial) 68 def options_for_find_by_initial(klass, initial)
71 # FIXME copy/pasted from options_for_find above !!! 69 # FIXME copy/pasted from options_for_find above !!!
72 case klass.name 70 case klass.name
73 - when 'Comment'  
74 - {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id in (?) and (comments.title like (?) or comments.title like (?))', category_ids, initial + '%', initial.upcase + '%']}  
75 when 'Product' 71 when 'Product'
76 {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and (products.name like (?) or products.name like (?))', category_ids, initial + '%', initial.upcase + '%']} 72 {:select => 'distinct products.*', :joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id in (?) and (products.name like (?) or products.name like (?))', category_ids, initial + '%', initial.upcase + '%']}
77 when 'Article', 'Person', 'Community', 'Enterprise' 73 when 'Article', 'Person', 'Community', 'Enterprise'
app/models/comment.rb
  Diff comments   View file @50ba75f
@@ -39,10 +39,6 @@ class Comment < ActiveRecord::Base @@ -39,10 +39,6 @@ class Comment < ActiveRecord::Base
39 self.find(:all, :order => 'created_at desc, id desc', :limit => limit) 39 self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
40 end 40 end
41 41
42 - def self.find_by_initial(initial)  
43 - self.find(:all, :order => 'comments.title', :conditions => ['comments.title like (?) or comments.title like (?)', initial + '%', initial.upcase + '%'])  
44 - end  
45 -  
46 after_save :notify_article 42 after_save :notify_article
47 after_destroy :notify_article 43 after_destroy :notify_article
48 def notify_article 44 def notify_article
app/models/environment.rb
  Diff comments   View file @50ba75f
@@ -220,7 +220,4 @@ class Environment < ActiveRecord::Base @@ -220,7 +220,4 @@ class Environment < ActiveRecord::Base
220 220
221 has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 221 has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
222 222
223 - # FIXME is this the better/faster way to do this?  
224 - has_many :comments, :through => :articles  
225 -  
226 end 223 end
test/unit/category_finder_test.rb
  Diff comments   View file @50ba75f
@@ -40,25 +40,6 @@ class CategoryFinderTest < ActiveSupport::TestCase @@ -40,25 +40,6 @@ class CategoryFinderTest < ActiveSupport::TestCase
40 assert_not_includes @finder.find('articles','found'), art2 40 assert_not_includes @finder.find('articles','found'), art2
41 end 41 end
42 42
43 - should 'search for comments in a specific category' do  
44 - person = create_user('teste').person  
45 -  
46 - # in category  
47 - art1 = person.articles.build(:name => 'an article to be found')  
48 - art1.categories << @category  
49 - art1.save!  
50 - comment1 = art1.comments.build(:title => 'comment to be found', :body => 'hfyfyh', :author => person); comment1.save!  
51 -  
52 - # not in category  
53 - art2 = person.articles.build(:name => 'another article to be found')  
54 - art2.save!  
55 - comment2 = art2.comments.build(:title => 'comment to be found', :body => 'hfyfyh', :author => person); comment2.save!  
56 -  
57 - list = @finder.find(:comments, 'found')  
58 - assert_includes list, comment1  
59 - assert_not_includes list, comment2  
60 - end  
61 -  
62 should 'search for enterprises in a specific category' do 43 should 'search for enterprises in a specific category' do
63 44
64 # in category 45 # in category
@@ -239,19 +220,6 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase @@ -239,19 +220,6 @@ class CategoryFinderTest &lt; ActiveSupport::TestCase
239 assert_not_includes list, a2 220 assert_not_includes list, a2
240 end 221 end
241 222
242 - should 'find comments by initial' do  
243 - person = create_user('testuser').person  
244 - a1 = person.articles.create!(:name => 'aaaa', :body => '...', :categories => [@category])  
245 -  
246 - c1 = a1.comments.create!(:title => 'aaaaa', :body => '...', :author => person)  
247 - c2 = a1.comments.create!(:title => 'bbbbb', :body => '...', :author => person)  
248 -  
249 - list = CategoryFinder.new(@category).find_by_initial(:comments, 'a')  
250 -  
251 - assert_includes list, c1  
252 - assert_not_includes list, c2  
253 - end  
254 -  
255 should 'find person and enterprise by radius and region' do 223 should 'find person and enterprise by radius and region' do
256 finder = CategoryFinder.new(@category) 224 finder = CategoryFinder.new(@category)
257 225
test/unit/environment_finder_test.rb
  Diff comments   View file @50ba75f
@@ -23,13 +23,6 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase @@ -23,13 +23,6 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase
23 assert_includes finder.find(:communities, 'beautiful'), c1 23 assert_includes finder.find(:communities, 'beautiful'), c1
24 end 24 end
25 25
26 - should 'find comments' do  
27 - person = create_user('teste').person  
28 - art = person.articles.build(:name => 'an article to be found'); art.save!  
29 - comment = art.comments.build(:title => 'comment to be found', :body => 'some sample text', :author => person); comment.save!  
30 - assert_includes EnvironmentFinder.new(Environment.default).find(:comments, 'found'), comment  
31 - end  
32 -  
33 should 'find products' do 26 should 'find products' do
34 finder = EnvironmentFinder.new(Environment.default) 27 finder = EnvironmentFinder.new(Environment.default)
35 ent = Enterprise.create!(:name => 'teste', :identifier => 'teste') 28 ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
@@ -95,19 +88,6 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase @@ -95,19 +88,6 @@ class EnvironmentFinderTest &lt; ActiveSupport::TestCase
95 assert_not_includes found, c2 88 assert_not_includes found, c2
96 end 89 end
97 90
98 - should 'find comments by initial' do  
99 - person = create_user('teste').person  
100 - art = person.articles.build(:name => 'an article to be found'); art.save!  
101 -  
102 - comment1 = art.comments.build(:title => 'a comment to be found', :body => 'some sample text', :author => person); comment1.save!  
103 - comment2 = art.comments.build(:title => 'b: a comment to be found', :body => 'some sample text', :author => person); comment2.save!  
104 -  
105 - found = EnvironmentFinder.new(Environment.default).find_by_initial(:comments, 'a')  
106 -  
107 - assert_includes found, comment1  
108 - assert_not_includes found, comment2  
109 - end  
110 -  
111 should 'find products by initial' do 91 should 'find products by initial' do
112 finder = EnvironmentFinder.new(Environment.default) 92 finder = EnvironmentFinder.new(Environment.default)
113 ent = Enterprise.create!(:name => 'teste', :identifier => 'teste') 93 ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')