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-04-23 14:16:00 +08:00
parent 6a04bb18ab
commit 77c9b8805f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/projects_controller.rb
View File

@ -7,12 +7,10 @@ class ProjectsController < ApplicationController
def index def index
is_admin = current_user && current_user&.admin? is_admin = current_user && current_user&.admin?
scope = Projects::ListQuery.call(params.merge(is_admin: is_admin, user_id: current_user.try(:id))) scope = Projects::ListQuery.call(params.merge(is_admin: is_admin, user_id: current_user.try(:id)))
scope_ids = scope.pluck(:id) @total_count = scope.size
@total_count = scope_ids.size @projects = paginate(scope)
@projects = paginate(Project.where(id: scope_ids))
end end
def create def create

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

@ -21,12 +21,11 @@ class Projects::ListQuery < ApplicationQuery
.with_project_type(params[:project_type]) .with_project_type(params[:project_type])
.with_project_category(params[:category_id]) .with_project_category(params[:category_id])
.with_project_language(params[:language_id]) .with_project_language(params[:language_id])
scope = scope.no_anomory_projects.distinct scope_ids = scope.no_anomory_projects.distinct.pluck(:id)
scope = projects.where(id: scope_ids)
sort = params[:sort_by] || "updated_on" sort = params[:sort_by] || "updated_on"
sort_direction = params[:sort_direction] || "desc" sort_direction = params[:sort_direction] || "desc"
scope = scope.order("projects.#{sort} #{sort_direction}") custom_sort(scope, "projects.#{sort}", sort_direction)
scope
# custom_sort(scope, params[:sort_by], params[:sort_direction])
end end
end end