From c8c8b44489e74bf5471f9a09200543caae56091b Mon Sep 17 00:00:00 2001 From: "marius.balteanu" Date: Sun, 20 Mar 2022 22:25:02 +0200 Subject: [PATCH] Include GroupNonMember and GroupAnonymous roles (#34029). --- app/models/user.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index eac3d82ae..209a6aba1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -610,6 +610,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 -- 2.35.1