diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-11-02 15:05:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 22:05:41 +0800 |
| commit | 350c10fe5bef393bee64f8ad2a7dada5353bbaa1 (patch) | |
| tree | a0e7d8b3fc4c9122676b2e898993015b5d6cb18c | |
| parent | 02259a0f3aaa257daf97fb1ec5f5c83c937a2602 (diff) | |
| download | gitea-350c10fe5bef393bee64f8ad2a7dada5353bbaa1.tar.gz gitea-350c10fe5bef393bee64f8ad2a7dada5353bbaa1.zip | |
Fix reactions on code comments (#13390) (#13401)
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 06268dcf53657ffe012abe878e1127ab4f954264)
| -rw-r--r-- | models/issue_comment.go | 4 | ||||
| -rw-r--r-- | templates/repo/diff/comments.tmpl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index 270a10e240..a5b6588fa9 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -1124,6 +1124,10 @@ func fetchCodeCommentsByReview(e Engine, issue *Issue, currentUser *User, review return nil, err } + if err := comment.LoadReactions(issue.Repo); err != nil { + return nil, err + } + if re, ok := reviews[comment.ReviewID]; ok && re != nil { // If the review is pending only the author can see the comments (except the review is set) if review.ID == 0 { diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 097d437a6d..69e87a7a70 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -30,7 +30,7 @@ </div> {{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/add_reaction" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }} {{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> @@ -48,7 +48,7 @@ {{$reactions := .Reactions.GroupByType}} {{if $reactions}} <div class="ui attached segment reactions"> - {{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}} + {{template "repo/issue/view_content/reactions" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}} </div> {{end}} </div> |