diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-05 18:44:09 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-05 18:44:09 +0300 |
commit | 6be3f910bad180909fbb14f000376a8334292d37 (patch) | |
tree | 6f75d26bb4abf22a1f448c9155e9abc65107fdfe /app/models | |
parent | 07e7ce31e341cc6e01ea403e2d0f2b8bc1f6bd57 (diff) | |
parent | 5db229fb45c98424425bf14c6b9e4ede8ccef1d1 (diff) |
Merge branch '33154-permissions-for-project-labels-and-group-labels' into 'master'
Resolve "Permissions for project labels and group labels"
Closes #33154
See merge request !11876
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/group.rb | 10 | ||||
-rw-r--r-- | app/models/member.rb | 4 | ||||
-rw-r--r-- | app/models/members/group_member.rb | 4 | ||||
-rw-r--r-- | app/models/members/project_member.rb | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index be944da5a67..5bb2cdc5eff 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -222,6 +222,16 @@ class Group < Namespace User.where(id: members_with_parents.select(:user_id)) end + def max_member_access_for_user(user) + return GroupMember::OWNER if user.admin? + + members_with_parents. + where(user_id: user). + reorder(access_level: :desc). + first&. + access_level || GroupMember::NO_ACCESS + end + def mattermost_team_params max_length = 59 diff --git a/app/models/member.rb b/app/models/member.rb index 7228e82e978..29f9d61e870 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -200,6 +200,10 @@ class Member < ActiveRecord::Base source_type end + def access_field + access_level + end + def invite? self.invite_token.present? end diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb index 28e10bc6172..47040f95533 100644 --- a/app/models/members/group_member.rb +++ b/app/models/members/group_member.rb @@ -25,10 +25,6 @@ class GroupMember < Member source end - def access_field - access_level - end - # Because source_type is `Namespace`... def real_source_type 'Group' diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index b3a91feb091..c0e17f4bfc8 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -79,10 +79,6 @@ class ProjectMember < Member end end - def access_field - access_level - end - def project source end |