diff options
| author | Jason Hollingsworth <jhworth.developer@gmail.com> | 2014-02-14 00:45:51 +0400 |
|---|---|---|
| committer | Jason Hollingsworth <jhworth.developer@gmail.com> | 2014-02-20 19:26:38 +0400 |
| commit | 2f69213e3f32e2e4222f6335e790e2c778069014 (patch) | |
| tree | 3734a9d41d2445a1557ed2f79c6cfa3de7dec215 /app/models/group.rb | |
| parent | 138e2a50b7d839bd37c21b2849df422f9dfef6bb (diff) | |
Allow access to groups with public projects.
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
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 8de0c78c158..0d4d5f4e836 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -25,6 +25,12 @@ class Group < Namespace validates :avatar, file_size: { maximum: 100.kilobytes.to_i } mount_uploader :avatar, AttachmentUploader + + def self.accessible_to(user) + accessible_ids = Project.accessible_to(user).pluck(:namespace_id) + accessible_ids += user.groups.pluck(:id) if user + where(id: accessible_ids) + end def human_name name |