diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-01-19 01:28:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 01:28:38 +0800 |
| commit | 84f8ef3df6316cb8fe8048556288452c07da4d7b (patch) | |
| tree | 296b77f102062d9a8e847b25d175e78eefca2c0b /routers | |
| parent | 11b482779136fdfb5faf8cffe3241ed0578f82c2 (diff) | |
| download | gitea-84f8ef3df6316cb8fe8048556288452c07da4d7b.tar.gz gitea-84f8ef3df6316cb8fe8048556288452c07da4d7b.zip | |
Fix PR comments UI (#18323)
Closes:
* Review comment cannot be edited #17768
* Changing PR Comment Resolved State Disables Further Changes #18315
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/repo/issue_comment.go | 4 | ||||
| -rw-r--r-- | routers/web/repo/issue.go | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index b929cec373..f90028a0ab 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -537,7 +537,9 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption) if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.IsAdmin()) { ctx.Status(http.StatusForbidden) return - } else if comment.Type != models.CommentTypeComment { + } + + if comment.Type != models.CommentTypeComment && comment.Type != models.CommentTypeReview && comment.Type != models.CommentTypeCode { ctx.Status(http.StatusNoContent) return } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index ee94e0e6d8..9dee477537 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1333,7 +1333,7 @@ func ViewIssue(ctx *context.Context) { return } - if comment.Type == models.CommentTypeComment { + if comment.Type == models.CommentTypeComment || comment.Type == models.CommentTypeReview { if err := comment.LoadAttachments(); err != nil { ctx.ServerError("LoadAttachments", err) return @@ -2194,7 +2194,9 @@ func UpdateCommentContent(ctx *context.Context) { if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) { ctx.Error(http.StatusForbidden) return - } else if comment.Type != models.CommentTypeComment && comment.Type != models.CommentTypeCode { + } + + if comment.Type != models.CommentTypeComment && comment.Type != models.CommentTypeReview && comment.Type != models.CommentTypeCode { ctx.Error(http.StatusNoContent) return } @@ -2212,11 +2214,9 @@ func UpdateCommentContent(ctx *context.Context) { return } - if comment.Type == models.CommentTypeComment { - if err := comment.LoadAttachments(); err != nil { - ctx.ServerError("LoadAttachments", err) - return - } + if err := comment.LoadAttachments(); err != nil { + ctx.ServerError("LoadAttachments", err) + return } // when the update request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates @@ -2404,7 +2404,9 @@ func ChangeCommentReaction(ctx *context.Context) { ctx.Error(http.StatusForbidden) return - } else if comment.Type != models.CommentTypeComment && comment.Type != models.CommentTypeCode { + } + + if comment.Type != models.CommentTypeComment && comment.Type != models.CommentTypeCode && comment.Type != models.CommentTypeReview { ctx.Error(http.StatusNoContent) return } |