Add reviewrs as participants (#8124)
This commit is contained in:
parent
c4d8d53a6d
commit
b228d22736
2 changed files with 12 additions and 12 deletions
|
@ -1446,7 +1446,7 @@ func getParticipantsByIssueID(e Engine, issueID int64) ([]*User, error) {
|
|||
userIDs := make([]int64, 0, 5)
|
||||
if err := e.Table("comment").Cols("poster_id").
|
||||
Where("`comment`.issue_id = ?", issueID).
|
||||
And("`comment`.type = ?", CommentTypeComment).
|
||||
And("`comment`.type in (?,?,?)", CommentTypeComment, CommentTypeCode, CommentTypeReview).
|
||||
And("`user`.is_active = ?", true).
|
||||
And("`user`.prohibit_login = ?", false).
|
||||
Join("INNER", "`user`", "`user`.id = `comment`.poster_id").
|
||||
|
|
|
@ -805,17 +805,7 @@ func ViewIssue(ctx *context.Context) {
|
|||
return
|
||||
}
|
||||
marked[comment.PosterID] = comment.ShowTag
|
||||
|
||||
isAdded := false
|
||||
for j := range participants {
|
||||
if comment.Poster == participants[j] {
|
||||
isAdded = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !isAdded && !issue.IsPoster(comment.Poster.ID) {
|
||||
participants = append(participants, comment.Poster)
|
||||
}
|
||||
participants = addParticipant(comment.Poster, participants)
|
||||
} else if comment.Type == models.CommentTypeLabel {
|
||||
if err = comment.LoadLabel(); err != nil {
|
||||
ctx.ServerError("LoadLabel", err)
|
||||
|
@ -851,6 +841,7 @@ func ViewIssue(ctx *context.Context) {
|
|||
ctx.ServerError("LoadReview", err)
|
||||
return
|
||||
}
|
||||
participants = addParticipant(comment.Poster, participants)
|
||||
if comment.Review == nil {
|
||||
continue
|
||||
}
|
||||
|
@ -1573,3 +1564,12 @@ func ChangeCommentReaction(ctx *context.Context, form auth.ReactionForm) {
|
|||
"html": html,
|
||||
})
|
||||
}
|
||||
|
||||
func addParticipant(poster *models.User, participants []*models.User) []*models.User {
|
||||
for _, part := range participants {
|
||||
if poster.ID == part.ID {
|
||||
return participants
|
||||
}
|
||||
}
|
||||
return append(participants, poster)
|
||||
}
|
||||
|
|
Reference in a new issue