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

Merge branch 'standalone_develop' into pm_project_develop

This commit is contained in:
yystopf 2023-12-01 10:00:38 +08:00
parent c97d5f9fdf 21640fe5e6
commit 1bbf53279b
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/issues/issue_priorities_controller.rb
View File

@ -3,7 +3,7 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController
before_action :require_public_and_member_above, only: [:index] before_action :require_public_and_member_above, only: [:index]
def index def index
@priorities = IssuePriority.order(position: :asc) @priorities = IssuePriority.where.not(name: '立刻').order(position: :asc)
@priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword] @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword]
@priorities = kaminary_select_paginate(@priorities) @priorities = kaminary_select_paginate(@priorities)
end end

2
app/controllers/api/v1/issues/statues_controller.rb
View File

@ -4,7 +4,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController
# 状态列表 # 状态列表
def index def index
@statues = IssueStatus.order("position asc") @statues = IssueStatus.where.not(name: '反馈').order("position asc")
@statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present? @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
@statues = kaminary_select_paginate(@statues) @statues = kaminary_select_paginate(@statues)
end end

7
app/services/api/v1/issues/list_service.rb
View File

@ -122,13 +122,16 @@ class Api::V1::Issues::ListService < ApplicationService
when 'opened' when 'opened'
issues = issues.opened issues = issues.opened
end end
if only_name.present? if only_name.present?
scope = issues.select(:id, :subject, :project_issues_index, :updated_on, :created_on) scope = issues.select(:id, :subject, :project_issues_index, :updated_on, :created_on)
scope = scope.reorder("#{sort_by} #{sort_direction}").distinct scope = scope.reorder("#{sort_by} #{sort_direction}").distinct
else else
scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals) scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals)
scope = scope.reorder("#{sort_by} #{sort_direction}").distinct scope = if sort_by == 'issue_priorities.position'
scope.reorder("issue_priorities.position #{sort_direction}, issues.created_on DESC").distinct
else
scope.reorder("#{sort_by} #{sort_direction}").distinct
end
end end
@queried_issues = scope @queried_issues = scope