meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Code formatting (#19982).

Browse Source 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14298 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-06-06 07:22:05 +00:00
parent e3e80c0df1
commit 836ac7f537
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/member.rb
View File

@ -76,8 +76,8 @@ class Member < ActiveRecord::Base
end end
end end
# Set member role ids ignoring any change to roles that # Set member role ids ignoring any change to roles that
# user is not allowed to manage # user is not allowed to manage
def set_editable_role_ids(ids, user=User.current) def set_editable_role_ids(ids, user=User.current)
ids = (ids || []).collect(&:to_i) - [0] ids = (ids || []).collect(&:to_i) - [0]
editable_role_ids = user.managed_roles(project).map(&:id) editable_role_ids = user.managed_roles(project).map(&:id)
@ -86,17 +86,17 @@ class Member < ActiveRecord::Base
self.role_ids = untouched_role_ids + touched_role_ids self.role_ids = untouched_role_ids + touched_role_ids
end end
# Returns true if one of the member roles is inherited # Returns true if one of the member roles is inherited
def any_inherited_role? def any_inherited_role?
member_roles.any? {|mr| mr.inherited_from} member_roles.any? {|mr| mr.inherited_from}
end end
# Returns true if the member has the role and if it's inherited # Returns true if the member has the role and if it's inherited
def has_inherited_role?(role) def has_inherited_role?(role)
member_roles.any? {|mr| mr.role_id == role.id && mr.inherited_from.present?} member_roles.any? {|mr| mr.role_id == role.id && mr.inherited_from.present?}
end end
# Returns true if the member's role is editable by user # Returns true if the member's role is editable by user
def role_editable?(role, user=User.current) def role_editable?(role, user=User.current)
if has_inherited_role?(role) if has_inherited_role?(role)
false false
@ -105,7 +105,7 @@ class Member < ActiveRecord::Base
end end
end end
# Returns true if the member is deletable by user # Returns true if the member is deletable by user
def deletable?(user=User.current) def deletable?(user=User.current)
if any_inherited_role? if any_inherited_role?
false false
@ -114,14 +114,14 @@ class Member < ActiveRecord::Base
end end
end end
# Destroys the member # Destroys the member
def destroy def destroy
member_roles.reload.each(&:destroy_without_member_removal) member_roles.reload.each(&:destroy_without_member_removal)
super super
end end
# Returns true if the member is user or is a group # Returns true if the member is user or is a group
# that includes user # that includes user
def include?(user) def include?(user)
if principal.is_a?(Group) if principal.is_a?(Group)
!user.nil? && user.groups.include?(principal) !user.nil? && user.groups.include?(principal)