Download as
Browse Code »

Commit 6446d98e894815b0483aa0988706ad73e617901e

Authored by Antonio Terceiro
1 parent 937b283e
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: displaying profiles to admins

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @6446d98
... ... @@ -470,7 +470,7 @@ class Profile < ActiveRecord::Base
470 470 false
471 471 else
472 472 # other possibilities would come here
473   - (user == self) || (user.memberships.include?(self))
  473 + (user == self) || (user.is_admin?(self.environment)) || (user.memberships.include?(self))
474 474 end
475 475 end
476 476 end
... ...
test/unit/profile_test.rb
  Diff comments   View file @6446d98
... ... @@ -525,6 +525,13 @@ class ProfileTest < Test::Unit::TestCase
525 525 assert c.display_info_to?(p)
526 526 end
527 527  
  528 + should 'display profile for administrators' do
  529 + p = create_user('testuser').person
  530 + p.update_attribute('public_profile', false)
  531 + admin = Person[create_admin_user(p.environment)]
  532 + assert p.display_info_to?(admin)
  533 + end
  534 +
528 535 should 'be able to add extra data for index' do
529 536 klass = Class.new(Profile)
530 537 klass.any_instance.expects(:random_method)
... ...