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

change parent_id to root_id

This commit is contained in:
呱呱呱 2023-11-07 14:30:28 +08:00
parent 8329cc113b
commit 00448f0f01
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/pm/issues_controller.rb
View File

@ -112,7 +112,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
:milestone_id, :assigner_id, :milestone_id, :assigner_id,
:status_id, :status_id,
:begin_date, :end_date, :begin_date, :end_date,
:sort_by, :sort_direction,:parent_id, :sort_by, :sort_direction, :root_id,
:issue_tag_ids, :pm_project_id, :pm_sprint_id, :pm_issue_type :issue_tag_ids, :pm_project_id, :pm_sprint_id, :pm_issue_type
) )
end end
@ -124,7 +124,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
:status_id, :priority_id, :milestone_id, :status_id, :priority_id, :milestone_id,
:branch_name, :start_date, :due_date, :time_scale, :branch_name, :start_date, :due_date, :time_scale,
:subject, :description, :blockchain_token_num, :subject, :description, :blockchain_token_num,
:pm_project_id, :pm_sprint_id, :pm_issue_type, :parent_id, :pm_project_id, :pm_sprint_id, :pm_issue_type, :root_id,
issue_tag_ids: [], issue_tag_ids: [],
assigner_ids: [], assigner_ids: [],
attachment_ids: [], attachment_ids: [],

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

@ -32,7 +32,7 @@ class Api::V1::Issues::CreateService < ApplicationService
@pm_project_id = params[:pm_project_id] @pm_project_id = params[:pm_project_id]
@pm_sprint_id = params[:pm_sprint_id] @pm_sprint_id = params[:pm_sprint_id]
@pm_issue_type = params[:pm_issue_type] @pm_issue_type = params[:pm_issue_type]
@parent_id = params[:parent_id] @root_id = params[:root_id]
@time_scale = params[:time_scale] @time_scale = params[:time_scale]
end end
@ -64,7 +64,7 @@ class Api::V1::Issues::CreateService < ApplicationService
@created_issue.pm_project_id = @pm_project_id @created_issue.pm_project_id = @pm_project_id
@created_issue.pm_sprint_id = @pm_sprint_id @created_issue.pm_sprint_id = @pm_sprint_id
@created_issue.pm_issue_type = @pm_issue_type @created_issue.pm_issue_type = @pm_issue_type
@created_issue.parent_id = @parent_id @created_issue.root_id = @root_id
@created_issue.time_scale = @time_scale @created_issue.time_scale = @time_scale
@created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank? @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank?
@created_issue.save! @created_issue.save!

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

@ -4,7 +4,7 @@ class Api::V1::Issues::ListService < ApplicationService
attr_reader :project, :only_name, :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 :begin_date, :end_date attr_reader :begin_date, :end_date
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_reader :pm_project_id, :pm_sprint_id, :parent_id, :pm_issue_type attr_reader :pm_project_id, :pm_sprint_id, :root_id, :pm_issue_type
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
validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"}
@ -29,7 +29,7 @@ class Api::V1::Issues::ListService < ApplicationService
@sort_by = params[:sort_by].present? ? params[:sort_by] : 'issues.updated_on' @sort_by = params[:sort_by].present? ? params[:sort_by] : 'issues.updated_on'
@pm_project_id = params[:pm_project_id] @pm_project_id = params[:pm_project_id]
@pm_sprint_id = params[:pm_sprint_id] @pm_sprint_id = params[:pm_sprint_id]
@parent_id = params[:parent_id] @root_id = params[:root_id]
@pm_issue_type = params[:pm_issue_type] @pm_issue_type = params[:pm_issue_type]
@sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase
@current_user = current_user @current_user = current_user
@ -60,7 +60,6 @@ class Api::V1::Issues::ListService < ApplicationService
when 'atme' # @我的 when 'atme' # @我的
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: current_user&.id}) issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: current_user&.id})
end end
# author_id # author_id
issues = issues.where(author_id: author_id) if author_id.present? issues = issues.where(author_id: author_id) if author_id.present?
@ -71,8 +70,8 @@ class Api::V1::Issues::ListService < ApplicationService
issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present? issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present?
#pm相关 #pm相关
# parent_id, # root_id,
issues = issues.where(parent_id: parent_id) if parent_id.present? issues = issues.where(root_id: root_id) if root_id.present?
# pm_issue_type # pm_issue_type
issues = issues.where(pm_issue_type: pm_issue_type) if pm_issue_type.present? issues = issues.where(pm_issue_type: pm_issue_type) if pm_issue_type.present?