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

修改数量

This commit is contained in:
sylor_huang@126.com 2020-03-25 18:44:07 +08:00
parent 098c520501
commit 17f39ee583
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/project_categories_controller.rb
View File

@ -8,7 +8,7 @@ class ProjectCategoriesController < ApplicationController
if is_admin if is_admin
projects = Project.all projects = Project.all
elsif current_user&.logged? elsif current_user&.logged?
projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ) projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ).distinct
else else
projects = Project.visible projects = Project.visible
end end

2
app/controllers/projects_controller.rb
View File

@ -42,7 +42,7 @@ class ProjectsController < ApplicationController
if is_admin if is_admin
projects = Project.all projects = Project.all
elsif current_user&.logged? elsif current_user&.logged?
projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ) projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ).distinct
else else
projects = Project.visible projects = Project.visible
end end

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

@ -13,7 +13,7 @@ class Projects::ListQuery < ApplicationQuery
if params[:is_admin] if params[:is_admin]
projects = Project.all projects = Project.all
elsif params[:user_id].to_i != 2 elsif params[:user_id].to_i != 2
projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, params[:user_id].to_i,params[:user_id].to_i ) projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, params[:user_id].to_i,params[:user_id].to_i ).distinct
else else
projects = Project.visible projects = Project.visible
end end