Download as
Browse Code »

Commit 937b283ee87ada81e07d4978fc85f650fed0e8d1

Authored by Antonio Terceiro
1 parent 4e35d6fc
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

ActionItem956: article is visible to those who can edit it

Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @937b283
... ... @@ -197,7 +197,7 @@ class Article < ActiveRecord::Base
197 197 if user.nil?
198 198 false
199 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 201 end
202 202 end
203 203 end
... ...
test/unit/article_test.rb
  Diff comments   View file @937b283
... ... @@ -507,6 +507,17 @@ class ArticleTest < Test::Unit::TestCase
507 507 assert article.display_to?(friend)
508 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 521 should 'make a copy of the article as child of it' do
511 522 person = create_user('test_user').person
512 523 a = person.articles.create!(:name => 'test article', :body => 'some text')
... ...