diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-06 13:09:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-06 13:09:38 +0800 |
| commit | 61619c84d0fc511f2532f8c82d98fe971da69447 (patch) | |
| tree | 4039efbf7d9b6f68ea8d60633a3e5c4418e0bfef | |
| parent | c481dba52c00c331903689291cf946330be9fb3e (diff) | |
| download | gitea-61619c84d0fc511f2532f8c82d98fe971da69447.tar.gz gitea-61619c84d0fc511f2532f8c82d98fe971da69447.zip | |
Fix 500 error when adding PR comment (#29622)
| -rw-r--r-- | routers/web/repo/pull_review.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go index 64212291e1..bce807aacd 100644 --- a/routers/web/repo/pull_review.go +++ b/routers/web/repo/pull_review.go @@ -10,6 +10,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" pull_model "code.gitea.io/gitea/models/pull" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" @@ -19,6 +20,7 @@ import ( "code.gitea.io/gitea/services/context/upload" "code.gitea.io/gitea/services/forms" pull_service "code.gitea.io/gitea/services/pull" + user_service "code.gitea.io/gitea/services/user" ) const ( @@ -203,6 +205,10 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment, ori return } ctx.Data["AfterCommitID"] = pullHeadCommitID + ctx.Data["CanBlockUser"] = func(blocker, blockee *user_model.User) bool { + return user_service.CanBlockUser(ctx, ctx.Doer, blocker, blockee) + } + if origin == "diff" { ctx.HTML(http.StatusOK, tplDiffConversation) } else if origin == "timeline" { |