From ffbaefb9b788d0fa89306153aabb9c0e4e4b9f21 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 3 Feb 2010 10:35:03 -0300 Subject: [PATCH] Only correct roles a showed to organization's members --- app/controllers/my_profile/profile_members_controller.rb | 2 +- app/models/profile.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb index 7af7630..0a0bce3 100644 --- a/app/controllers/my_profile/profile_members_controller.rb +++ b/app/controllers/my_profile/profile_members_controller.rb @@ -20,7 +20,7 @@ class ProfileMembersController < MyProfileController end def change_role - @roles = profile.roles + @roles = Profile::Roles.organization_member_roles(environment.id) @member = profile.members.find { |m| m.id == params[:id].to_i } if @member @associations = @member.find_roles(@profile) diff --git a/app/models/profile.rb b/app/models/profile.rb index 1af61de..82a566b 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -19,6 +19,9 @@ class Profile < ActiveRecord::Base def self.editor(env_id) find_role('editor', env_id) end + def self.organization_member_roles(env_id) + [admin(env_id), moderator(env_id), member(env_id)] + end def self.all_roles(env_id) [admin(env_id), member(env_id), moderator(env_id), owner(env_id), editor(env_id)] end -- libgit2 0.21.2