summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/project.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e0994b4ba..83c678bda 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -216,8 +216,11 @@ class Project < ActiveRecord::Base
end
def override_roles(role)
+ @override_members ||= member_principals.
+ where("#{Principal.table_name}.type IN (?)", ['GroupAnonymous', 'GroupNonMember']).to_a
+
group_class = role.anonymous? ? GroupAnonymous : GroupNonMember
- member = member_principals.where("#{Principal.table_name}.type = ?", group_class.name).first
+ member = @override_members.detect {|m| m.principal.is_a? group_class}
member ? member.roles.to_a : [role]
end