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

Merge branch 'standalone_develop' into pm_project_develop

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ class Api::V1::Issues::ListService < ApplicationService
@current_user = current_user
end
def call
def call
raise Error, errors.full_messages.join(', ') unless valid?
# begin
issue_query_data
@@ -72,7 +72,7 @@ class Api::V1::Issues::ListService < ApplicationService
# issue_tag_ids
issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(',')).result unless issue_tag_ids.blank?
# milestone_id
issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
@@ -112,7 +112,7 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
@total_issues_count = issues.distinct.size
@closed_issues_count = issues.closed.distinct.size
@closed_issues_count = issues.closed.distinct.size
@opened_issues_count = issues.opened.distinct.size
@complete_issues_count = issues.closed.distinct.size + issues.where(status_id: 3).distinct.size - issues.where(pm_issue_type: 3, status_id: 3).size
@@ -122,13 +122,16 @@ class Api::V1::Issues::ListService < ApplicationService
when 'opened'
issues = issues.opened
end
if only_name.present?
scope = issues.select(:id, :subject, :project_issues_index, :updated_on, :created_on)
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 = 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
@queried_issues = scope