diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-08-25 01:19:49 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-08-26 11:30:01 +0300 |
| commit | 37edce19dd2f006ef2117ca8a9f05398e704a11c (patch) | |
| tree | 3997f640f8377fd2c90855d202cb19c99a5a9853 /app/models/group.rb | |
| parent | af6968a15859a309cbb93a0327fc1d4be36041bc (diff) | |
recognize instances where group visibility levels are unavailable
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index b093e0b200c..257a5075d2c 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -136,6 +136,12 @@ class Group < Namespace children.where('visibility_level > ?', level).none? end + def visibility_level_allowed?(level = self.visibility_level) + visibility_level_allowed_by_parent?(level) && + visibility_level_allowed_by_projects?(level) && + visibility_level_allowed_by_sub_groups?(level) + end + def avatar_url(**args) # We use avatar_path instead of overriding avatar_url because of carrierwave. # See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11001/diffs#note_28659864 |