ActionItem616: stop showing private content on seraches

added the common method public? to trace public content and made it not be shown in search results. Know issue: the numbers of total results is wrong when private content would be retrived if it were public git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2398 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem616: stop showing private content on seraches
added the common method public? to trace public content and made it not be shown in search results. Know issue: the numbers of total results is wrong when private content would be retrived if it were public git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2398 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent dc74649b
Showing 8 changed files with 110 additions and 3 deletions Show diff stats
app/models/article.rb
app/models/product.rb
app/models/profile.rb
app/views/search/_display_results.rhtml
test/functional/cms_controller_test.rb
test/unit/article_test.rb
test/unit/product_test.rb
test/unit/profile_test.rb
@@ -42,6 +42,13 @@ class Article &lt; ActiveRecord::Base
     pending_categorizations.clear
   end
+  before_save do |article|
+    if article.parent
+      article.public_article = article.parent.public_article
+    end
+    true
+  end
+
   acts_as_taggable  
   N_('Tag list')
@@ -156,6 +163,10 @@ class Article &lt; ActiveRecord::Base
     !cat.is_a?(ProductCategory)
   end
+  def public?
+    profile.public? && public_article
+  end
+
   private
   def sanitize_tag_list
@@ -63,4 +63,8 @@ class Product &lt; ActiveRecord::Base
     enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => id)
   end
+  def public?
+    enterprise.public_profile
+  end
+
 end
@@ -304,16 +304,24 @@ class Profile &lt; ActiveRecord::Base
     false
   end
-  after_create :insert_default_homepage_and_feed
-  def insert_default_homepage_and_feed
+  after_create :insert_default_article_set
+  def insert_default_article_set
+    # a default homepage
     hp = default_homepage(:name => _("%s's home page") % self.name, :body => _("<p>This is a default homepage created for %s. It can be changed though the control panel.</p>") % self.name, :advertise => false)
     hp.profile = self
     hp.save!
     self.home_page = hp
     self.save!
+    # a default rss feed
     feed = RssFeed.new(:name => 'feed')
     self.articles << feed
+
+    # a default private folder if public
+    if self.public?
+      folder = Folder.new(:name => _("Intranet"), :public_article => false)
+      self.articles << folder
+    end
   end
   # Adds a person as member of this Profile.
@@ -403,4 +411,7 @@ class Profile &lt; ActiveRecord::Base
     self[:theme] || environment.theme
   end
+  def public?
+    public_profile
+  end
 end
@@ -38,7 +38,7 @@
           <ul>
           <% hit_pos = 0 %>
           <% results.each do |hit| %>
-            <% next if hit.respond_to?(:public_profile) && !hit.public_profile  %>
+            <% next if hit.respond_to?(:public?) && !hit.public?  %>
             <%= render :partial => partial_for_class(hit.class),
                        :object => hit,
@@ -347,6 +347,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   end
   should 'list folders at top level' do
+    Folder.destroy_all
     f1 = Folder.new(:name => 'f1'); profile.articles << f1;  f1.save!
     f2 = Folder.new(:name => 'f2'); profile.articles << f2;  f2.save!
@@ -542,4 +543,15 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_redirected_to @profile.articles.find_by_name('new-article-from-public-view').url
   end
+  should 'create a private article child of private folder' do
+    folder = Folder.new(:name => 'my intranet', :public_article => false); profile.articles << folder; folder.save!
+    
+    post :new, :profile => profile.identifier, :type => 'TextileArticle', :parent_id => folder.id, :article => { :name => 'new-private-article'}
+    folder.reload
+
+    assert !assigns(:article).public?
+    assert_equal 'new-private-article', folder.children[0].name
+    assert !folder.children[0].public?
+  end
+
 end
@@ -364,4 +364,45 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert !article.display_to?(person2)
     assert article.display_to?(person1)
   end
+
+  should 'make new article private if created inside a private folder' do
+    profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
+    folder = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
+    article = Article.create!(:name => 'my private article', :profile => profile, :parent => folder)
+
+    assert !article.public_article
+  end
+
+  should 'respond to public? like public_article if profile is public' do
+    p = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
+    a1 = Article.create!(:name => 'test public article', :profile => p)
+    a2 = Article.create!(:name => 'test private article', :profile => p, :public_article => false)
+
+    assert a1.public?
+    assert !a2.public?
+  end
+
+  should 'respond to public? as false if profile is private' do
+    p = Profile.create!(:name => 'test profile', :identifier => 'test_profile', :public_profile => false)
+    a1 = Article.create!(:name => 'test public article', :profile => p)
+    a2 = Article.create!(:name => 'test private article', :profile => p, :public_article => false)
+
+    assert !a1.public?
+    assert !a2.public?
+  end
+
+  should 'save as private' do
+    profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
+    folder = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
+    article = TextileArticle.new(:name => 'my private article')
+    article.profile = profile
+    article.parent = folder
+    article.save!
+    article.reload
+
+    assert !article.public_article
+
+
+  end
+
 end
@@ -168,4 +168,16 @@ class ProductTest &lt; Test::Unit::TestCase
     assert !ProductCategorization.find(:first, :conditions => {:product_id => p, :category_id => cat}) 
   end
+  should 'respond to public? as its enterprise public?' do
+    e1 = Enterprise.create!(:name => 'test ent 1', :identifier => 'test_ent1')
+    p1 = Product.create!(:name => 'test product 1', :enterprise => e1)
+
+    assert p1.public?
+
+    e1.public_profile = false
+    e1.save!
+
+    assert !p1.public?
+  end
+
 end
@@ -794,6 +794,22 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal 'environment-stored-theme', p.theme
   end
+  should 'respond to public? as public_profile' do
+    p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
+    p2 = Profile.create!(:name => 'test profile 2', :identifier => 'test_profile2', :public_profile => false)
+
+    assert p1.public?
+    assert !p2.public?
+  end
+
+  should 'create a initial private folder when a public profile is created' do
+    p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
+    p2 = Profile.create!(:name => 'test profile 2', :identifier => 'test_profile2', :public_profile => false)
+    
+    assert p1.articles.find(:first, :conditions => {:public_article => false})
+    assert !p2.articles.find(:first, :conditions => {:public_article => false})
+  end
+
   private
   def assert_invalid_identifier(id)
	@@ -42,6 +42,13 @@ class Article < ActiveRecord::Base		@@ -42,6 +42,13 @@ class Article < ActiveRecord::Base
42	pending_categorizations.clear	42	pending_categorizations.clear
43	end	43	end
44		44
		45	+ before_save do \|article\|
		46	+ if article.parent
		47	+ article.public_article = article.parent.public_article
		48	+ end
		49	+ true
		50	+ end
		51	+
45	acts_as_taggable	52	acts_as_taggable
46	N_('Tag list')	53	N_('Tag list')
47		54
	@@ -156,6 +163,10 @@ class Article < ActiveRecord::Base		@@ -156,6 +163,10 @@ class Article < ActiveRecord::Base
156	!cat.is_a?(ProductCategory)	163	!cat.is_a?(ProductCategory)
157	end	164	end
158		165
		166	+ def public?
		167	+ profile.public? && public_article
		168	+ end
		169	+
159	private	170	private
160		171
161	def sanitize_tag_list	172	def sanitize_tag_list
	@@ -63,4 +63,8 @@ class Product < ActiveRecord::Base		@@ -63,4 +63,8 @@ class Product < ActiveRecord::Base
63	enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => id)	63	enterprise.generate_url(:controller => 'catalog', :action => 'show', :id => id)
64	end	64	end
65		65
		66	+ def public?
		67	+ enterprise.public_profile
		68	+ end
		69	+
66	end	70	end
	@@ -38,7 +38,7 @@		@@ -38,7 +38,7 @@
38	<ul>	38	<ul>
39	<% hit_pos = 0 %>	39	<% hit_pos = 0 %>
40	<% results.each do \|hit\| %>	40	<% results.each do \|hit\| %>
41	- <% next if hit.respond_to?(:public_profile) && !hit.public_profile %>	41	+ <% next if hit.respond_to?(:public?) && !hit.public? %>
42	<%= render :partial => partial_for_class(hit.class),	42	<%= render :partial => partial_for_class(hit.class),
43		43
44	:object => hit,	44	:object => hit,
	@@ -347,6 +347,7 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -347,6 +347,7 @@ class CmsControllerTest < Test::Unit::TestCase
347	end	347	end
348		348
349	should 'list folders at top level' do	349	should 'list folders at top level' do
		350	+ Folder.destroy_all
350	f1 = Folder.new(:name => 'f1'); profile.articles << f1; f1.save!	351	f1 = Folder.new(:name => 'f1'); profile.articles << f1; f1.save!
351	f2 = Folder.new(:name => 'f2'); profile.articles << f2; f2.save!	352	f2 = Folder.new(:name => 'f2'); profile.articles << f2; f2.save!
352		353
	@@ -542,4 +543,15 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -542,4 +543,15 @@ class CmsControllerTest < Test::Unit::TestCase
542	assert_redirected_to @profile.articles.find_by_name('new-article-from-public-view').url	543	assert_redirected_to @profile.articles.find_by_name('new-article-from-public-view').url
543	end	544	end
544		545
		546	+ should 'create a private article child of private folder' do
		547	+ folder = Folder.new(:name => 'my intranet', :public_article => false); profile.articles << folder; folder.save!
		548	+
		549	+ post :new, :profile => profile.identifier, :type => 'TextileArticle', :parent_id => folder.id, :article => { :name => 'new-private-article'}
		550	+ folder.reload
		551	+
		552	+ assert !assigns(:article).public?
		553	+ assert_equal 'new-private-article', folder.children[0].name
		554	+ assert !folder.children[0].public?
		555	+ end
		556	+
545	end	557	end
	@@ -364,4 +364,45 @@ class ArticleTest < Test::Unit::TestCase		@@ -364,4 +364,45 @@ class ArticleTest < Test::Unit::TestCase
364	assert !article.display_to?(person2)	364	assert !article.display_to?(person2)
365	assert article.display_to?(person1)	365	assert article.display_to?(person1)
366	end	366	end
		367	+
		368	+ should 'make new article private if created inside a private folder' do
		369	+ profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
		370	+ folder = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
		371	+ article = Article.create!(:name => 'my private article', :profile => profile, :parent => folder)
		372	+
		373	+ assert !article.public_article
		374	+ end
		375	+
		376	+ should 'respond to public? like public_article if profile is public' do
		377	+ p = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
		378	+ a1 = Article.create!(:name => 'test public article', :profile => p)
		379	+ a2 = Article.create!(:name => 'test private article', :profile => p, :public_article => false)
		380	+
		381	+ assert a1.public?
		382	+ assert !a2.public?
		383	+ end
		384	+
		385	+ should 'respond to public? as false if profile is private' do
		386	+ p = Profile.create!(:name => 'test profile', :identifier => 'test_profile', :public_profile => false)
		387	+ a1 = Article.create!(:name => 'test public article', :profile => p)
		388	+ a2 = Article.create!(:name => 'test private article', :profile => p, :public_article => false)
		389	+
		390	+ assert !a1.public?
		391	+ assert !a2.public?
		392	+ end
		393	+
		394	+ should 'save as private' do
		395	+ profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
		396	+ folder = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
		397	+ article = TextileArticle.new(:name => 'my private article')
		398	+ article.profile = profile
		399	+ article.parent = folder
		400	+ article.save!
		401	+ article.reload
		402	+
		403	+ assert !article.public_article
		404	+
		405	+
		406	+ end
		407	+
367	end	408	end
	@@ -168,4 +168,16 @@ class ProductTest < Test::Unit::TestCase		@@ -168,4 +168,16 @@ class ProductTest < Test::Unit::TestCase
168	assert !ProductCategorization.find(:first, :conditions => {:product_id => p, :category_id => cat})	168	assert !ProductCategorization.find(:first, :conditions => {:product_id => p, :category_id => cat})
169	end	169	end
170		170
		171	+ should 'respond to public? as its enterprise public?' do
		172	+ e1 = Enterprise.create!(:name => 'test ent 1', :identifier => 'test_ent1')
		173	+ p1 = Product.create!(:name => 'test product 1', :enterprise => e1)
		174	+
		175	+ assert p1.public?
		176	+
		177	+ e1.public_profile = false
		178	+ e1.save!
		179	+
		180	+ assert !p1.public?
		181	+ end
		182	+
171	end	183	end
	@@ -794,6 +794,22 @@ class ProfileTest < Test::Unit::TestCase		@@ -794,6 +794,22 @@ class ProfileTest < Test::Unit::TestCase
794	assert_equal 'environment-stored-theme', p.theme	794	assert_equal 'environment-stored-theme', p.theme
795	end	795	end
796		796
		797	+ should 'respond to public? as public_profile' do
		798	+ p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
		799	+ p2 = Profile.create!(:name => 'test profile 2', :identifier => 'test_profile2', :public_profile => false)
		800	+
		801	+ assert p1.public?
		802	+ assert !p2.public?
		803	+ end
		804	+
		805	+ should 'create a initial private folder when a public profile is created' do
		806	+ p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
		807	+ p2 = Profile.create!(:name => 'test profile 2', :identifier => 'test_profile2', :public_profile => false)
		808	+
		809	+ assert p1.articles.find(:first, :conditions => {:public_article => false})
		810	+ assert !p2.articles.find(:first, :conditions => {:public_article => false})
		811	+ end
		812	+
797	private	813	private
798		814
799	def assert_invalid_identifier(id)	815	def assert_invalid_identifier(id)