floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 12:45:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复：issue_classify 使用小写

Browse Source
This commit is contained in:
yystopf
2023-02-23 17:32:55 +08:00
parent dc01d7fc3e
commit 8487c67bab
9 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/api/v1/issues/batch_update_service.rb
View File

@@ -20,7 +20,7 @@ class Api::V1::Issues::BatchUpdateService < ApplicationService
raise Error, errors.full_messages.join(", ") unless valid?
ActiveRecord::Base.transaction do
@issues.each do |issue|
if issue.issue_classify == "Issue"
if issue.issue_classify == "issue"
Api::V1::Issues::UpdateService.call(project, issue, params, current_user)
end
end

2
app/services/api/v1/issues/create_service.rb
View File

@@ -85,7 +85,7 @@ class Api::V1::Issues::CreateService < ApplicationService
priority_id: priority_id,
project_issues_index: (project.get_last_project_issues_index + 1),
issue_type: "1",
issue_classify: "Issue"
issue_classify: "issue"
}
issue_attributes.merge!({description: description}) if description.present?

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

@@ -56,7 +56,7 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.where(author_id: author_id) if author_id.present?
# issue_tag_ids
issues = issues.joins(:issue_tags).where(issue_tags: {id: issue_tag_ids}) unless issue_tag_ids.blank?
issues = issues.joins(:issue_tags).ransack(issue_tags_id_in_all: issue_tag_ids).result unless issue_tag_ids.blank?
# milestone_id
issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
@@ -68,7 +68,7 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.where(status_id: status_id) if status_id.present?
# keyword
issues = issues.ransack(subject_or_description_cont: keyword).result
issues = issues.ransack(subject_or_description_cont: keyword).result if keyword.present?
@total_issues_count = issues.size
@closed_issues_count = issues.closed.size
@@ -81,7 +81,7 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.opened
end
scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals)
scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :issue_tags, :comment_journals)
scope = scope.reorder("#{sort_by} #{sort_direction}").distinct

10
app/services/api/v1/issues/update_service.rb
View File

@@ -36,14 +36,14 @@ class Api::V1::Issues::UpdateService < ApplicationService
check_issue_status(status_id) if status_id.present?
check_issue_priority(priority_id) if priority_id.present?
check_milestone(milestone_id) if milestone_id.present?
check_issue_tags(issue_tag_ids) unless issue_tag_ids.blank?
check_assigners(assigner_ids) unless assigner_ids.blank?
check_attachments(attachment_ids) unless attachment_ids.blank?
check_atme_receivers(receivers_login) unless receivers_login.blank?
check_issue_tags(issue_tag_ids) unless issue_tag_ids.nil?
check_assigners(assigner_ids) unless assigner_ids.nil?
check_attachments(attachment_ids) unless attachment_ids.nil?
check_atme_receivers(receivers_login) unless receivers_login.nil?
load_assigners(assigner_ids)
load_attachments(attachment_ids)
load_issue_tags(issue_tag_ids)
load_atme_receivers(receivers_login) unless receivers_login.blank?
load_atme_receivers(receivers_login) unless receivers_login.nil?
try_lock("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}")
@updated_issue = @issue