floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-02 19:30:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX query projects list

Browse Source
This commit is contained in:
Jasder
2020-05-09 15:51:40 +08:00
parent 31afff4907
commit 1e0811006b
6 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,10 @@ class Projects::ListQuery < ApplicationQuery
end
def call
projects = Project.visible
scope = projects.includes(:project_category, :project_language).like(params[:search])
q = Project.visible.ransack(name_or_identifier_cont: params[:search])
scope = q.result(distinct: true)
.includes(:project_category, :project_language, :repository, owner: :user_extension)
.with_project_type(params[:project_type])
.with_project_category(params[:category_id])
.with_project_language(params[:language_id])
@@ -19,13 +21,7 @@ class Projects::ListQuery < ApplicationQuery
sort = params[:sort_by] || "updated_on"
sort_direction = params[:sort_direction] || "desc"
scope = scope.no_anomory_projects.distinct.includes(:project_category, :project_language, :repository, owner: :user_extension).reorder("projects.#{sort} #{sort_direction}")
scope = scope.no_anomory_projects.reorder("projects.#{sort} #{sort_direction}")
scope
#cope_ids = scope.select(:id,:user_id).no_anomory_projects.distinct.pluck(:id)
#sort = params[:sort_by] || "updated_on"
#sort_direction = params[:sort_direction] || "desc"
#projects.where(id: scope_ids).includes(:project_category, :project_language, :repository, owner: :user_extension).reorder("projects.#{sort} #{sort_direction}")
end
end