floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2023-03-31 14:58:22 +08:00
parent 02099758fb 5226196f4e
commit e8fd75670a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/queries/projects/list_my_query.rb
View File

@ -36,7 +36,7 @@ class Projects::ListMyQuery < ApplicationQuery
projects = projects.where(id: fork_ids) projects = projects.where(id: fork_ids)
elsif params[:category].to_s == "admin" elsif params[:category].to_s == "admin"
normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: "owner"},team_users: {user_id: user.id}).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: %w(owner admin)},team_users: {user_id: user.id}).to_sql
projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
# elsif params[:category].to_s == "public" # elsif params[:category].to_s == "public"
# projects = projects.visible.joins(:members).where(members: { user_id: user.id }) # projects = projects.visible.joins(:members).where(members: { user_id: user.id })