mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-31 19:47:14 +00:00
Include roles of built-in "Non member users" and "Anonymous users" members when user is not a member of the project. This fixes #34029.
git-svn-id: https://svn.redmine.org/redmine/trunk@21502 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d27582644a
commit
883fcb89ee
@ -622,6 +622,15 @@ class User < Principal
|
||||
Role.joins(members: :project).
|
||||
where(["#{Project.table_name}.status <> ?", Project::STATUS_ARCHIVED]).
|
||||
where(Member.arel_table[:user_id].eq(id)).distinct
|
||||
|
||||
if @roles.blank?
|
||||
group_class = anonymous? ? GroupAnonymous : GroupNonMember
|
||||
@roles = Role.joins(members: :project).
|
||||
where(["#{Project.table_name}.status <> ? AND #{Project.table_name}.is_public = ?", Project::STATUS_ARCHIVED, true]).
|
||||
where(Member.arel_table[:user_id].eq(group_class.first.id)).distinct
|
||||
end
|
||||
|
||||
@roles
|
||||
end
|
||||
|
||||
# Returns the user's bult-in role
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user