Move if check back to correct branch and refactor template file

routers/api/v1/repo/pull_review.go

@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -372,7 +373,7 @@ func CreatePullReview(ctx *context.APIContext) {
 	// create review and associate all pending review comments
 	review, _, err := pull_service.SubmitReview(ctx, ctx.Doer, ctx.Repo.GitRepo, pr.Issue, reviewType, opts.Body, opts.CommitID, nil)
 	if err != nil {
-		if pull_service.IsErrSubmitReviewOnClosedPR(err) {
+		if errors.Is(err, pull_service.ErrSubmitReviewOnClosedPR) {
 			ctx.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
 			ctx.Error(http.StatusInternalServerError, "SubmitReview", err)
@@ -464,7 +465,7 @@ func SubmitPullReview(ctx *context.APIContext) {
 	// create review and associate all pending review comments
 	review, _, err = pull_service.SubmitReview(ctx, ctx.Doer, ctx.Repo.GitRepo, pr.Issue, reviewType, opts.Body, headCommitID, nil)
 	if err != nil {
-		if pull_service.IsErrSubmitReviewOnClosedPR(err) {
+		if errors.Is(err, pull_service.ErrSubmitReviewOnClosedPR) {
 			ctx.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
 			ctx.Error(http.StatusInternalServerError, "SubmitReview", err)

routers/web/repo/pull_review.go

@@ -264,7 +264,7 @@ func SubmitReview(ctx *context.Context) {
 		if issues_model.IsContentEmptyErr(err) {
 			ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty"))
 			ctx.JSONRedirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
-		} else if pull_service.IsErrSubmitReviewOnClosedPR(err) {
+		} else if errors.Is(err, pull_service.ErrSubmitReviewOnClosedPR) {
 			ctx.Status(http.StatusUnprocessableEntity)
 		} else {
 			ctx.ServerError("SubmitReview", err)

services/pull/review.go

@@ -6,6 +6,7 @@ package pull
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"regexp"
@@ -44,21 +45,7 @@ func (err ErrDismissRequestOnClosedPR) Unwrap() error {
 }
 
 // ErrSubmitReviewOnClosedPR represents an error when an user tries to submit an approve or reject review associated to a closed or merged PR.
-type ErrSubmitReviewOnClosedPR struct{}
-
-// IsErrSubmitReviewOnClosedPR checks if an error is an ErrSubmitReviewOnClosedPR.
-func IsErrSubmitReviewOnClosedPR(err error) bool {
-	_, ok := err.(ErrSubmitReviewOnClosedPR)
-	return ok
-}
-
-func (err ErrSubmitReviewOnClosedPR) Error() string {
-	return "can't submit review for a closed or merged PR"
-}
-
-func (err ErrSubmitReviewOnClosedPR) Unwrap() error {
-	return util.ErrPermissionDenied
-}
+var ErrSubmitReviewOnClosedPR = errors.New("can't submit review for a closed or merged PR")
 
 // checkInvalidation checks if the line of code comment got changed by another commit.
 // If the line got changed the comment is going to be invalidated.
@@ -310,8 +297,8 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 	if reviewType != issues_model.ReviewTypeApprove && reviewType != issues_model.ReviewTypeReject {
 		stale = false
 	} else {
-		if issue.IsClosed || pr.HasMerged {
-			return nil, nil, ErrSubmitReviewOnClosedPR{}
+		if issue.IsClosed {
+			return nil, nil, ErrSubmitReviewOnClosedPR
 		}
 
 		headCommitID, err := gitRepo.GetRefCommitID(pr.GetGitRefName())

templates/repo/diff/new_review.tmpl

@@ -30,8 +30,7 @@
 				{{end}}
 				<div class="divider"></div>
 				{{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}}
-				{{$isOpen := (not (or $.Issue.IsClosed (and $.Issue.IsPull $.Issue.PullRequest.HasMerged)))}}
-				{{if $isOpen}}
+				{{if not $.Issue.IsClosed}}
 					{{if $showSelfTooltip}}
 						<span class="tw-inline-block" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_approve"}}">
 							<button type="submit" name="type" value="approve" disabled class="ui submit primary tiny button btn-submit">{{ctx.Locale.Tr "repo.diff.review.approve"}}</button>
@@ -41,7 +40,7 @@
 					{{end}}
 				{{end}}
 				<button type="submit" name="type" value="comment" class="ui submit tiny basic button btn-submit">{{ctx.Locale.Tr "repo.diff.review.comment"}}</button>
-				{{if $isOpen}}
+				{{if not $.Issue.IsClosed}}
 					{{if $showSelfTooltip}}
 						<span class="tw-inline-block" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.review.self_reject"}}">
 							<button type="submit" name="type" value="reject" disabled class="ui submit red tiny button btn-submit">{{ctx.Locale.Tr "repo.diff.review.reject"}}</button>