Optionaly inherit members from parent project (#5605).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11298 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-02-02 12:50:45 +00:00
parent 137aa1cf66
commit 0f29e265fc
10 changed files with 376 additions and 9 deletions
+10
View File
@@ -97,6 +97,16 @@ class Member < ActiveRecord::Base
@membership
end
# Finds or initilizes a Member for the given project and principal
def self.find_or_new(project, principal)
project_id = project.is_a?(Project) ? project.id : project
principal_id = principal.is_a?(Principal) ? principal.id : principal
member = Member.find_by_project_id_and_user_id(project_id, principal_id)
member ||= Member.new(:project_id => project_id, :user_id => principal_id)
member
end
protected
def validate_role
+15 -5
View File
@@ -21,8 +21,8 @@ class MemberRole < ActiveRecord::Base
after_destroy :remove_member_if_empty
after_create :add_role_to_group_users
after_destroy :remove_role_from_group_users
after_create :add_role_to_group_users, :add_role_to_subprojects
after_destroy :remove_inherited_roles
validates_presence_of :role
validate :validate_role_member
@@ -44,16 +44,26 @@ class MemberRole < ActiveRecord::Base
end
def add_role_to_group_users
if member.principal.is_a?(Group)
if member.principal.is_a?(Group) && !inherited?
member.principal.users.each do |user|
user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id)
user_member = Member.find_or_new(member.project_id, user.id)
user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
user_member.save!
end
end
end
def remove_role_from_group_users
def add_role_to_subprojects
member.project.children.each do |subproject|
if subproject.inherit_members?
child_member = Member.find_or_new(subproject.id, member.user_id)
child_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
child_member.save!
end
end
end
def remove_inherited_roles
MemberRole.where(:inherited_from => id).all.group_by(&:member).each do |member, member_roles|
member_roles.each(&:destroy)
if member && member.user
+46
View File
@@ -82,6 +82,7 @@ class Project < ActiveRecord::Base
validates_exclusion_of :identifier, :in => %w( new )
after_save :update_position_under_parent, :if => Proc.new {|project| project.name_changed?}
after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
before_destroy :delete_all_members
scope :has_module, lambda {|mod|
@@ -651,6 +652,9 @@ class Project < ActiveRecord::Base
safe_attributes 'enabled_module_names',
:if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }
safe_attributes 'inherit_members',
:if => lambda {|project, user| project.parent.nil? || project.parent.visible?(:user)}
# Returns an array of projects that are in this project's hierarchy
#
# Example: parents, children, siblings
@@ -726,6 +730,44 @@ class Project < ActiveRecord::Base
private
def after_parent_changed(parent_was)
remove_inherited_member_roles
add_inherited_member_roles
end
def update_inherited_members
if parent
if inherit_members? && !inherit_members_was
remove_inherited_member_roles
add_inherited_member_roles
elsif !inherit_members? && inherit_members_was
remove_inherited_member_roles
end
end
end
def remove_inherited_member_roles
member_roles = memberships.map(&:member_roles).flatten
member_role_ids = member_roles.map(&:id)
member_roles.each do |member_role|
if member_role.inherited_from && !member_role_ids.include?(member_role.inherited_from)
member_role.destroy
end
end
end
def add_inherited_member_roles
if inherit_members? && parent
parent.memberships.each do |parent_member|
member = Member.find_or_new(self.id, parent_member.user_id)
parent_member.member_roles.each do |parent_member_role|
member.member_roles << MemberRole.new(:role => parent_member_role.role, :inherited_from => parent_member_role.id)
end
member.save!
end
end
end
# Copies wiki from +project+
def copy_wiki(project)
# Check that the source project has a wiki first
@@ -951,6 +993,7 @@ class Project < ActiveRecord::Base
# Inserts/moves the project so that target's children or root projects stay alphabetically sorted
def set_or_update_position_under(target_parent)
parent_was = parent
sibs = (target_parent.nil? ? self.class.roots : target_parent.children)
to_be_inserted_before = sibs.sort_by {|c| c.name.to_s.downcase}.detect {|c| c.name.to_s.downcase > name.to_s.downcase }
@@ -967,5 +1010,8 @@ class Project < ActiveRecord::Base
# move_to_child_of adds the project in last (ie.right) position
move_to_child_of(target_parent)
end
if parent_was != target_parent
after_parent_changed(parent_was)
end
end
end