mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Load reviewer for comments when dismissing a review (#24281) (#24288)

This commit is contained in:
Giteabot 2023-04-23 12:44:57 -04:00 committed by GitHub
parent 7297cceda7
commit 7e86dffc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/issues/comment_list.go
View File

@ -56,7 +56,7 @@ func (comments CommentList) getLabelIDs() []int64 {
return ids.Values() return ids.Values()
} }
func (comments CommentList) loadLabels(ctx context.Context) error { //nolint func (comments CommentList) loadLabels(ctx context.Context) error {
if len(comments) == 0 { if len(comments) == 0 {
return nil return nil
} }
@ -415,7 +415,7 @@ func (comments CommentList) getReviewIDs() []int64 {
return ids.Values() return ids.Values()
} }
func (comments CommentList) loadReviews(ctx context.Context) error { //nolint func (comments CommentList) loadReviews(ctx context.Context) error {
if len(comments) == 0 { if len(comments) == 0 {
return nil return nil
} }
@ -453,6 +453,14 @@ func (comments CommentList) loadReviews(ctx context.Context) error { //nolint
for _, comment := range comments { for _, comment := range comments {
comment.Review = reviews[comment.ReviewID] comment.Review = reviews[comment.ReviewID]
// If the comment dismisses a review, we need to load the reviewer to show whose review has been dismissed.
// Otherwise, the reviewer is the poster of the comment, so we don't need to load it.
if comment.Type == CommentTypeDismissReview {
if err := comment.Review.LoadReviewer(ctx); err != nil {
return err
}
}
} }
return nil return nil
} }