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:
yystopf 2023-03-09 09:40:32 +08:00
parent 43cbb9cf4f
commit edf60ca0a8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/v1/issues_controller.rb
View File

@ -10,7 +10,7 @@ class Api::V1::IssuesController < Api::V1::BaseController
@opened_issues_count = @object_result[:opened_issues_count] @opened_issues_count = @object_result[:opened_issues_count]
@closed_issues_count = @object_result[:closed_issues_count] @closed_issues_count = @object_result[:closed_issues_count]
if params[:only_name].present? if params[:only_name].present?
@issues = kaminary_select_paginate(@object_result[:data].select(:id, :subject, :project_issues_index)) @issues = kaminary_select_paginate(@object_result[:data])
else else
@issues = kaminari_paginate(@object_result[:data]) @issues = kaminari_paginate(@object_result[:data])
end end
@ -86,6 +86,7 @@ class Api::V1::IssuesController < Api::V1::BaseController
def query_params def query_params
params.permit( params.permit(
:only_name,
:category, :category,
:participant_category, :participant_category,
:keyword, :author_id, :keyword, :author_id,

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

@ -1,7 +1,7 @@
class Api::V1::Issues::ListService < ApplicationService class Api::V1::Issues::ListService < ApplicationService
include ActiveModel::Model include ActiveModel::Model
attr_reader :project, :category, :participant_category, :keyword, :author_id, :issue_tag_ids attr_reader :project, :only_name, :category, :participant_category, :keyword, :author_id, :issue_tag_ids
attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count
@ -13,6 +13,7 @@ class Api::V1::Issues::ListService < ApplicationService
def initialize(project, params, current_user=nil) def initialize(project, params, current_user=nil)
@project = project @project = project
@only_name = params[:only_name]
@category = params[:category] || 'all' @category = params[:category] || 'all'
@participant_category = params[:participant_category] || 'all' @participant_category = params[:participant_category] || 'all'
@keyword = params[:keyword] @keyword = params[:keyword]
@ -81,9 +82,13 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.opened issues = issues.opened
end end
scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals) if only_name.present?
scope = issues.select(:id, :subject, :project_issues_index)
scope = scope.reorder("#{sort_by} #{sort_direction}").distinct scope = scope.reorder("project_issues_index asc").distinct
else
scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals)
scope = scope.reorder("#{sort_by} #{sort_direction}").distinct
end
@queried_issues = scope @queried_issues = scope
end end