ActionItem956: article is visible to those who can edit it

Antonio Terceiro
1 parent 4e35d6fc
Showing 2 changed files with 12 additions and 1 deletions Show diff stats
app/models/article.rb
test/unit/article_test.rb
@@ -197,7 +197,7 @@ class Article &lt; ActiveRecord::Base
       if user.nil?
         false
       else
-        (user == self.profile) || user.memberships.include?(self.profile) || (profile.kind_of?(Person) && profile.friends.include?(user))
+        (user == self.profile) || user.memberships.include?(self.profile) || (profile.kind_of?(Person) && profile.friends.include?(user)) || user.has_permission?('post_content', self.profile)
       end
     end
   end
@@ -507,6 +507,17 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert article.display_to?(friend)
   end
+
+  should 'display articles to people who can edit them' do
+    person = create_user('test_user').person
+    article = Article.create!(:name => 'test article', :profile => person, :public_article => false)
+
+    admin_user = create_user('admin_user').person
+    admin_user.stubs(:has_permission?).with('post_content', article.profile).returns('true')
+
+    assert article.display_to?(admin_user)
+  end
+
   should 'make a copy of the article as child of it' do
     person = create_user('test_user').person
     a = person.articles.create!(:name => 'test article', :body => 'some text')
	@@ -197,7 +197,7 @@ class Article < ActiveRecord::Base		@@ -197,7 +197,7 @@ class Article < ActiveRecord::Base
197	if user.nil?	197	if user.nil?
198	false	198	false
199	else	199	else
200	- (user == self.profile) \|\| user.memberships.include?(self.profile) \|\| (profile.kind_of?(Person) && profile.friends.include?(user))	200	+ (user == self.profile) \|\| user.memberships.include?(self.profile) \|\| (profile.kind_of?(Person) && profile.friends.include?(user)) \|\| user.has_permission?('post_content', self.profile)
201	end	201	end
202	end	202	end
203	end	203	end
	@@ -507,6 +507,17 @@ class ArticleTest < Test::Unit::TestCase		@@ -507,6 +507,17 @@ class ArticleTest < Test::Unit::TestCase
507	assert article.display_to?(friend)	507	assert article.display_to?(friend)
508	end	508	end
509		509
		510	+
		511	+ should 'display articles to people who can edit them' do
		512	+ person = create_user('test_user').person
		513	+ article = Article.create!(:name => 'test article', :profile => person, :public_article => false)
		514	+
		515	+ admin_user = create_user('admin_user').person
		516	+ admin_user.stubs(:has_permission?).with('post_content', article.profile).returns('true')
		517	+
		518	+ assert article.display_to?(admin_user)
		519	+ end
		520	+
510	should 'make a copy of the article as child of it' do	521	should 'make a copy of the article as child of it' do
511	person = create_user('test_user').person	522	person = create_user('test_user').person
512	a = person.articles.create!(:name => 'test article', :body => 'some text')	523	a = person.articles.create!(:name => 'test article', :body => 'some text')