Merge branch 'develop' into standalone_develop

This commit is contained in:
2022-10-21 14:32:03 +08:00
16 changed files with 71 additions and 22 deletions

View File

@@ -29,6 +29,8 @@ class Projects::ListMyQuery < ApplicationQuery
projects = projects.where(user_id: user.id)
elsif params[:category].to_s == "watched" #我关注的
projects = projects.where.not(user_id: user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: user.id})
elsif params[:category].to_s == 'only_watched'
projects = projects.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: user.id})
elsif params[:category].to_s == "forked" #我fork的
fork_ids = user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)
projects = projects.where(id: fork_ids)