floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 17:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop

Browse Source
This commit is contained in:
jasder
2021-11-05 11:36:51 +08:00
parent 9f31dc02f4 5cd7104fbb
commit c19c83d505
55 changed files with 299 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admins/project_categories_controller.rb
View File

@@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
def index
sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name])
q = ProjectCategory.ransack(name_cont: params[:name])
project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
@project_categories = paginate(project_categories)