Browse Source
Fix to allow comment poster to edit or delete his own comments (#11671) (#11774)
* bug: fix comment update permision check
No the ui only allow poster to update or delet comment, which
is not reasonable and different with handle logic, this pr
change it to allow poster of comment do it
ref code:
e8955173a9/routers/repo/issue.go (L1636)
e8955173a9/routers/repo/issue.go (L1681)
fix #11663
Signed-off-by: a101211279
<1012112796@qq.com>
* simplify code
* fix sign in
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
tags/v1.12.0-rc2
赵智超
3 years ago
No account linked to committer's email address
|
|
@@ -31,7 +31,7 @@ |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "diff" true }} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="ui attached segment"> |
|
|
@@ -41,7 +41,7 @@ |
|
|
|
{{if not $.Repository.IsArchived}} |
|
|
|
<div class="ui right actions"> |
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" .Issue "delete" false "diff" false }} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" .Issue "delete" false "diff" false "IsCommentPoster" $.IsIssuePoster}} |
|
|
|
</div> |
|
|
|
{{end}} |
|
|
|
</div> |
|
|
@@ -38,7 +38,7 @@ |
|
|
|
</div> |
|
|
|
{{end}} |
|
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false }} |
|
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}} |
|
|
|
</div> |
|
|
|
{{end}} |
|
|
|
</div> |
|
|
@@ -10,7 +10,7 @@ |
|
|
|
<div class="item context clipboard" data-clipboard-text="{{Printf "%s%s/issues/%d#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag}}">{{.ctx.i18n.Tr "repo.issues.context.copy_link"}}</div> |
|
|
|
{{end}} |
|
|
|
<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.ID}}">{{.ctx.i18n.Tr "repo.issues.context.quote_reply"}}</div> |
|
|
|
{{if or .ctx.Permission.IsAdmin .ctx.IsIssuePoster .ctx.HasIssuesOrPullsWritePermission}} |
|
|
|
{{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}} |
|
|
|
<div class="divider"></div> |
|
|
|
<div class="item context edit-content">{{.ctx.i18n.Tr "repo.issues.context.edit"}}</div> |
|
|
|
{{if .delete}} |