From d59e99feca70651b3744c5a09f47993fbaec95ea Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 11 Apr 2023 10:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 2 +- app/controllers/pull_requests_controller.rb | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 433432048..113c86a8c 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -10,7 +10,7 @@ class Api::V1::IssuesController < Api::V1::BaseController @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] if params[:only_name].present? - @issues = kaminary_select_paginate(@object_result[:data].pluck(:id, :subject)) + @issues = kaminary_select_paginate(@object_result[:data].select(:id, :subject, :project_issues_index, :updated_on)) else @issues = kaminari_paginate(@object_result[:data]) end diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index d02bb1deb..f5735d194 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -274,15 +274,10 @@ class PullRequestsController < ApplicationController body: params[:body], #内容 head: params[:head], #源分支 base: params[:base], #目标分支 - milestone: 0, #里程碑,未与本地的里程碑关联 + # milestone: 0, #里程碑,未与本地的里程碑关联 } assignee_login = User.find_by_id(params[:assigned_to_id])&.login - @requests_params = @local_params.merge({ - # assignees: ["#{params[:assigned_login].to_s}"], - assignees: ["#{assignee_login.to_s}"], - labels: params[:issue_tag_ids] - # due_date: Time.now - }) + @requests_params = @local_params.merge({assignees: [assignee_login.to_s].reject!(&:empty?)}) @issue_params = { author_id: current_user.id, project_id: @project.id,