From 9d3f3289b887a25f6d84bbb84afedad831e41be6 2015-01-24 08:54:04 From: Jean-Philippe Lang Date: 2015-01-24 08:54:04 Subject: [PATCH] Memorize project override roles. git-svn-id: http://svn.redmine.org/redmine/trunk@13934 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/project.rb b/app/models/project.rb index e0994b4..83c678b 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