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

Merge pull request '修复bug' (#175) from KingChan/forgeplus:pm_project_develop into pm_project_develop

This commit is contained in:
KingChan 2023-11-02 14:43:31 +08:00
parent 99fbd4c04d dd30341f6e
commit cf26f7b51b
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/pm/base_controller.rb
View File

@ -30,6 +30,7 @@ class Api::Pm::BaseController < ApplicationController
end end
def load_issue def load_issue
return render_parameter_missing if params[:pm_project_id].blank?
@issue = @project.issues.issue_issue.where(pm_project_id: params[:pm_project_id]).find_by_id(params[:id]) @issue = @project.issues.issue_issue.where(pm_project_id: params[:pm_project_id]).find_by_id(params[:id])
render_not_found('疑修不存在!') if @issue.blank? render_not_found('疑修不存在!') if @issue.blank?
end end

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

@ -2,8 +2,8 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
before_action :require_login, except: [:index] before_action :require_login, except: [:index]
before_action :load_project before_action :load_project
before_action :load_issue, only: %i[show update destroy] before_action :load_issue, only: %i[show update destroy]
before_action :load_issues, only: [:batch_update, :batch_destroy] before_action :load_issues, only: %i[batch_update batch_destroy]
before_action :check_issue_operate_permission, only: [:update, :destroy] before_action :check_issue_operate_permission, only: %i[update destroy]
def index def index
@object_result = Api::V1::Issues::ListService.call(@project, query_params, current_user) @object_result = Api::V1::Issues::ListService.call(@project, query_params, current_user)
@ -91,15 +91,9 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
private private
def check_issue_operate_permission def check_issue_operate_permission
return if params[:project_id].zero? return if params[:project_id].to_i.zero?
render_forbidden('您没有操作权限！') unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user render_forbidden('您没有操作权限！') unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user
end end
def load_issue
@issue = @project.issues.issue_issue.where(pm_project_id: params[:pm_project_id]).find_by_id(params[:id])
render_not_found('疑修不存在!') if @issue.blank?
end
def load_issues def load_issues
return render_error('请输入正确的ID数组！') unless params[:ids].is_a?(Array) return render_error('请输入正确的ID数组！') unless params[:ids].is_a?(Array)
params[:ids].each do |id| params[:ids].each do |id|