wangtao
/
forgeplus
forked from Nigel/forgeplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: personal projects

This commit is contained in:
vilet.yy 2021-04-29 16:26:39 +08:00
parent c920994274
commit b673747475
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,9 @@ class Projects::ListMyQuery < ApplicationQuery
end
if params[:category].blank?
projects = projects.members_projects(user.id)
normal_projects = projects.members_projects(user.id).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql
projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
elsif params[:category].to_s == "join"
normal_projects = projects.where.not(user_id: user.id).members_projects(user.id).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(team_users: {user_id: user.id}).to_sql