floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 17:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更改：疑修param为index以及新增统计标签下合并请求数量

Browse Source
This commit is contained in:
yystopf
2023-02-23 15:24:30 +08:00
parent edc00d28a7
commit dc9ca7d0ca
10 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/api/v1/issues/journals_controller.rb
View File

@@ -1,7 +1,7 @@
class Api::V1::Issues::JournalsController < Api::V1::IssuesController
class Api::V1::Issues::JournalsController < Api::V1::BaseController
before_action :require_login, except: [:index, :children_journals]
before_action :require_public_and_member_above, only: [:index, :create, :children_journals, :update, :destroy]
before_action :load_issue, only: [:index, :create, :children_journals, :update, :destroy]
before_action :require_public_and_member_above
before_action :load_issue
before_action :load_journal, only: [:children_journals, :update, :destroy]
before_action :check_journal_operate_permission, only: [:update, :destroy]
@@ -41,6 +41,13 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController
params.permit(:notes, :parent_id, :reply_id, :attachment_ids => [])
end
def load_issue
@issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index])
if @issue.blank?
render_not_found("疑修不存在!")
end
end
def load_journal
@journal = Journal.find_by_id(params[:id])
return render_not_found("评论不存在！") unless @journal.present?

1
app/controllers/api/v1/issues/milestones_controller.rb
View File

@@ -11,6 +11,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController
@closed_milestone_count = @milestones.closed.size
@opening_milestone_count = @milestones.opening.size
@milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening
@milestones = milestones.order("#{sort_by} #{sort_direction}")
if params[:only_name]
@milestones = @milestones.select(:id, :name)
@milestones = kaminary_select_paginate(@milestones)

8
app/controllers/api/v1/issues_controller.rb
View File

@@ -57,10 +57,10 @@ class Api::V1::IssuesController < Api::V1::BaseController
end
end
protected
private
def load_issue
@issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id])
@issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index])
if @issue.blank?
render_not_found("疑修不存在!")
end
@@ -79,9 +79,7 @@ class Api::V1::IssuesController < Api::V1::BaseController
def check_issue_operate_permission
return render_forbidden("您没有操作权限！") unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user
end
private
end
def query_params
params.permit(