diff options
| author | 6543 <6543@obermui.de> | 2022-07-19 15:20:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-19 15:20:28 +0200 |
| commit | c0f5111fea0b742a60113e1bda81bf39607d6ca8 (patch) | |
| tree | 78d8414ef40d6c4a2ddedfa7f71d10cee100feba /routers | |
| parent | e519249266cb69065b65f59477afa36f240b28cf (diff) | |
| download | gitea-c0f5111fea0b742a60113e1bda81bf39607d6ca8.tar.gz gitea-c0f5111fea0b742a60113e1bda81bf39607d6ca8.zip | |
Dismiss prior pull reviews if done via web in review dismiss (#20197)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/repo/pull_review.go | 8 | ||||
| -rw-r--r-- | routers/web/repo/pull_review.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go index 1b61a40222..f36d0586ab 100644 --- a/routers/api/v1/repo/pull_review.go +++ b/routers/api/v1/repo/pull_review.go @@ -823,7 +823,7 @@ func DismissPullReview(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" opts := web.GetForm(ctx).(*api.DismissPullReviewOptions) - dismissReview(ctx, opts.Message, true) + dismissReview(ctx, opts.Message, true, opts.Priors) } // UnDismissPullReview cancel to dismiss a review for a pull request @@ -863,10 +863,10 @@ func UnDismissPullReview(ctx *context.APIContext) { // "$ref": "#/responses/forbidden" // "422": // "$ref": "#/responses/validationError" - dismissReview(ctx, "", false) + dismissReview(ctx, "", false, false) } -func dismissReview(ctx *context.APIContext, msg string, isDismiss bool) { +func dismissReview(ctx *context.APIContext, msg string, isDismiss, dismissPriors bool) { if !ctx.Repo.IsAdmin() { ctx.Error(http.StatusForbidden, "", "Must be repo admin") return @@ -886,7 +886,7 @@ func dismissReview(ctx *context.APIContext, msg string, isDismiss bool) { return } - _, err := pull_service.DismissReview(ctx, review.ID, ctx.Repo.Repository.ID, msg, ctx.Doer, isDismiss) + _, err := pull_service.DismissReview(ctx, review.ID, ctx.Repo.Repository.ID, msg, ctx.Doer, isDismiss, dismissPriors) if err != nil { ctx.Error(http.StatusInternalServerError, "pull_service.DismissReview", err) return diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index 5a9f7a8138..bc64f35472 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -242,7 +242,7 @@ func SubmitReview(ctx *context.Context) { // DismissReview dismissing stale review by repo admin func DismissReview(ctx *context.Context) { form := web.GetForm(ctx).(*forms.DismissReviewForm) - comm, err := pull_service.DismissReview(ctx, form.ReviewID, ctx.Repo.Repository.ID, form.Message, ctx.Doer, true) + comm, err := pull_service.DismissReview(ctx, form.ReviewID, ctx.Repo.Repository.ID, form.Message, ctx.Doer, true, true) if err != nil { ctx.ServerError("pull_service.DismissReview", err) return |