From 8cb22839149a4e8f2fe7897a0f04548f47aed0ba Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Sun, 24 Apr 2022 17:38:50 +0800 Subject: [PATCH] #1821 update --- routers/repo/issue.go | 10 ++++++++-- routers/routes/routes.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 875c02024..d28936594 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1304,17 +1304,23 @@ func UpdateIssueContent(ctx *context.Context) { // UpdateIssueRef change issue's code reference func UpdateIssueRef(ctx *context.Context) { - issue := GetActionIssue(ctx) + issues := getActionIssues(ctx) if ctx.Written() { return } + issue := issues[0] + if issue == nil { + log.Error("UpdateIssueRef param error ") + return + } + if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)) { ctx.Error(403) return } - ref := ctx.Query("ref") + ref := ctx.Query("id") if err := issue_service.ChangeRef(issue, ctx.User, ref); err != nil { ctx.ServerError("ChangeRef", err) return diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7af42867c..bb57637d7 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -868,7 +868,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:index", func() { m.Post("/title", repo.UpdateIssueTitle) m.Post("/content", repo.UpdateIssueContent) - m.Post("/ref", repo.UpdateIssueRef) m.Post("/watch", repo.IssueWatch) m.Group("/dependency", func() { m.Post("/add", repo.AddDependency) @@ -891,6 +890,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/labels", reqRepoIssuesOrPullsWriter, repo.UpdateIssueLabel) m.Post("/milestone", reqRepoIssuesOrPullsWriter, repo.UpdateIssueMilestone) m.Post("/assignee", reqRepoIssuesOrPullsWriter, repo.UpdateIssueAssignee) + m.Post("/ref", reqRepoIssuesOrPullsWriter, repo.UpdateIssueRef) m.Post("/request_review", reqRepoIssuesOrPullsReader, repo.UpdatePullReviewRequest) m.Post("/status", reqRepoIssuesOrPullsWriter, repo.UpdateIssueStatus) m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation)