From 9d3f3289b887a25f6d84bbb84afedad831e41be6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 24 Jan 2015 08:54:04 +0000 Subject: [PATCH] Memorize project override roles. git-svn-id: http://svn.redmine.org/redmine/trunk@13934 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.39.5