meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Locked users should not be displayed in the members box of the project overview page (#35606).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21090 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-07-27 04:55:08 +00:00
parent 7534775306
commit da4303a961
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/project.rb
View File

@ -550,7 +550,7 @@ class Project < ActiveRecord::Base
# Returns a hash of project users/groups grouped by role
def principals_by_role
memberships.includes(:principal, :roles).inject({}) do |h, m|
memberships.active.includes(:principal, :roles).inject({}) do |h, m|
m.roles.each do |r|
h[r] ||= []
h[r] << m.principal

10
test/unit/project_test.rb
View File

@ -475,6 +475,16 @@ class ProjectTest < ActiveSupport::TestCase
assert principals_by_role[role].include?(group)
end
def test_principals_by_role_should_only_return_active_users
#group = Group.find(10)
#Member.create!(:principal => group, :project_id => 1, :role_ids => [1])
principals_by_role = Project.find(1).principals_by_role
locked_user = User.find(5)
assert Project.find(1).memberships.map(&:principal).include?(locked_user)
assert_not principals_by_role.values.flatten.include?(locked_user)
end
def test_rolled_up_trackers
parent = Project.find(1)
parent.trackers = Tracker.find([1, 2])