Download as
Browse Code »

Commit ffbaefb9b788d0fa89306153aabb9c0e4e4b9f21

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 36e56c4d
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

Only correct roles a showed to organization's members 

* The available roles for organization's members are:
		* Profile Administrator
		* Moderator
		* Member
	* Local roles aren't being considered because they're not working
	  correctly until now.

(ActionItem1382)
Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
app/controllers/my_profile/profile_members_controller.rb
  Diff comments   View file @ffbaefb
@@ -20,7 +20,7 @@ class ProfileMembersController < MyProfileController @@ -20,7 +20,7 @@ class ProfileMembersController < MyProfileController
20 end 20 end
21 21
22 def change_role 22 def change_role
23 - @roles = profile.roles 23 + @roles = Profile::Roles.organization_member_roles(environment.id)
24 @member = profile.members.find { |m| m.id == params[:id].to_i } 24 @member = profile.members.find { |m| m.id == params[:id].to_i }
25 if @member 25 if @member
26 @associations = @member.find_roles(@profile) 26 @associations = @member.find_roles(@profile)
app/models/profile.rb
  Diff comments   View file @ffbaefb
@@ -19,6 +19,9 @@ class Profile < ActiveRecord::Base @@ -19,6 +19,9 @@ class Profile < ActiveRecord::Base
19 def self.editor(env_id) 19 def self.editor(env_id)
20 find_role('editor', env_id) 20 find_role('editor', env_id)
21 end 21 end
  22 + def self.organization_member_roles(env_id)
  23 + [admin(env_id), moderator(env_id), member(env_id)]
  24 + end
22 def self.all_roles(env_id) 25 def self.all_roles(env_id)
23 [admin(env_id), member(env_id), moderator(env_id), owner(env_id), editor(env_id)] 26 [admin(env_id), member(env_id), moderator(env_id), owner(env_id), editor(env_id)]
24 end 27 end