Download as
Browse Code »

Commit 53d447a86c6d82cddb1c9372dba8f753d5b69b8f

Authored by Larissa Reis
Committed by Rodrigo Souto
1 parent da709178
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

Lists all roles a user has in a community

Showing 2 changed files with 19 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @53d447a
@@ -727,8 +727,13 @@ module ApplicationHelper @@ -727,8 +727,13 @@ module ApplicationHelper
727 end 727 end
728 728
729 def rolename_for(profile, resource) 729 def rolename_for(profile, resource)
730 - role = profile.role_assignments.find_by_resource_id(resource.id).role  
731 - content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}") 730 + roles = profile.role_assignments.select{ |a| a.resource_id == resource.id }.sort_by{ |s| s.role_id }.map(&:role)
  731 + names = ''
  732 + roles.each do |role|
  733 + names += content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
  734 + names += ', '
  735 + end
  736 + names.slice 0..-3
732 end 737 end
733 738
734 def role_color(role, env_id) 739 def role_color(role, env_id)
test/unit/application_helper_test.rb
  Diff comments   View file @53d447a
@@ -143,6 +143,18 @@ class ApplicationHelperTest < ActiveSupport::TestCase @@ -143,6 +143,18 @@ class ApplicationHelperTest < ActiveSupport::TestCase
143 assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Member' 143 assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Member'
144 end 144 end
145 145
  146 + should 'rolenames for a member admin' do
  147 + member1 = create_user('usertest1').person
  148 + member2 = create_user('usertest2').person
  149 + community = fast_create(Community, :name => 'new community', :identifier => 'new-community', :environment_id => Environment.default.id)
  150 + community.add_member(member1)
  151 + # member2 is both a admin and a member
  152 + community.add_member(member2)
  153 + community.add_admin(member2)
  154 + assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Member'
  155 + assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Administrator'
  156 + end
  157 +
146 should 'get theme from environment by default' do 158 should 'get theme from environment by default' do
147 @environment = mock 159 @environment = mock
148 @environment.stubs(:theme).returns('my-environment-theme') 160 @environment.stubs(:theme).returns('my-environment-theme')