From dddc4f975248fe8f523187eb0c659476919b6718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Wed, 15 Nov 2023 14:18:36 +0800 Subject: [PATCH] update issue link index --- app/controllers/api/pm/issues_controller.rb | 20 ++++++-------------- config/routes/api.rb | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index c9192ad94..7d681ac55 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -21,20 +21,13 @@ class Api::Pm::IssuesController < Api::Pm::BaseController def link_index pm_issue_type = params[:pm_issue_type] || [1, 2, 3] - not_join_id = @issue.pm_links.pluck(:be_linkable_id) - not_join_id << @issue.id - object_issues = Issue.includes(:pm_links).where( - pm_project_id: params[:pm_project_id], - root_id: nil, - pm_issue_type: pm_issue_type - ).where.not(id: not_join_id) - @issues = kaminari_paginate(object_issues) - render 'api/v1/issues/index' - end + not_join_id = case params[:issue_filter_type] + when 'leaf_issue' + @issue.pm_links.pluck(:be_linkable_id) + when 'link_issue' + Issue.where(root_id: @issue.id).pluck(:id) + end - def link_issues - pm_issue_type = params[:pm_issue_type] || [1, 2, 3] - not_join_id = Issue.where(root_id: @issue.id).pluck(:id) not_join_id << @issue.id object_issues = Issue.where( pm_project_id: params[:pm_project_id], @@ -45,7 +38,6 @@ class Api::Pm::IssuesController < Api::Pm::BaseController render 'api/v1/issues/index' end - def show @issue.associate_attachment_container render 'api/v1/issues/show' diff --git a/config/routes/api.rb b/config/routes/api.rb index 3a9b4ed88..2a08425c4 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -11,7 +11,6 @@ defaults format: :json do end member do get :link_index - get :link_issues end resources :issue_links