From 3981f1b1278f558721e4b40b6fdbba9365b9cb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=99=BA=E8=B6=85?= <1012112796@qq.com> Date: Thu, 3 Sep 2020 00:55:13 +0800 Subject: [PATCH] Remove duplicate logic in initListSubmits (#12660) * Remove duplicate logic in initListSubmits Using the same logic to handle Choosing reviewers and assignees as choosing label. It's the first step of #10926. Signed-off-by: a1012112796 <1012112796@qq.com> * fix choose block * fix nit * try fix bug * simple code Co-authored-by: techknowlogick --- routers/repo/issue.go | 14 +-- templates/repo/issue/view_content/pull.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 8 +- web_src/js/index.js | 92 ++++++++----------- 4 files changed, 49 insertions(+), 67 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index dabe0f6b0f..4bbc355027 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1516,10 +1516,11 @@ func updatePullReviewRequest(ctx *context.Context) { } reviewID := ctx.QueryInt64("id") - event := ctx.Query("is_add") + action := ctx.Query("action") - if event != "add" && event != "remove" { - ctx.ServerError("updatePullReviewRequest", fmt.Errorf("is_add should not be \"%s\"", event)) + // TODO: Not support 'clear' now + if action != "attach" && action != "detach" { + ctx.Status(403) return } @@ -1532,19 +1533,20 @@ func updatePullReviewRequest(ctx *context.Context) { return } - err = isLegalReviewRequest(reviewer, ctx.User, event == "add", issue) + err = isLegalReviewRequest(reviewer, ctx.User, action == "attach", issue) if err != nil { ctx.ServerError("isLegalRequestReview", err) return } - err = issue_service.ReviewRequest(issue, ctx.User, reviewer, event == "add") + err = issue_service.ReviewRequest(issue, ctx.User, reviewer, action == "attach") if err != nil { ctx.ServerError("ReviewRequest", err) return } } else { - ctx.ServerError("updatePullReviewRequest", fmt.Errorf("%d in %d is not Pull Request", issue.ID, issue.Repo.ID)) + ctx.Status(403) + return } } diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 94edc8b126..b9254adeab 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -49,7 +49,7 @@ {{end}} {{if $canChoose }} - + {{svg "octicon-sync" 16}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 71e84de2fa..d02dedfb81 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -12,7 +12,7 @@ {{svg "octicon-gear" 16}} {{end}} -