mirror of https://github.com/go-gitea/gitea.git
[UI] Hide consecutive additions and removals of the same label (#13315)
parent
afe9d79104
commit
8e368e7065
|
@ -2418,11 +2418,34 @@ func combineLabelComments(issue *models.Issue) {
|
||||||
c.AddedLabels[0] = c.Label
|
c.AddedLabels[0] = c.Label
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// Remove duplicated "added" and "removed" labels
|
||||||
|
// This way, adding and immediately removing a label won't generate a comment.
|
||||||
|
var appendingTo *[]*models.Label
|
||||||
|
var other *[]*models.Label
|
||||||
|
|
||||||
if removingCur {
|
if removingCur {
|
||||||
prev.RemovedLabels = append(prev.RemovedLabels, c.Label)
|
appendingTo = &prev.RemovedLabels
|
||||||
|
other = &prev.AddedLabels
|
||||||
} else {
|
} else {
|
||||||
prev.AddedLabels = append(prev.AddedLabels, c.Label)
|
appendingTo = &prev.AddedLabels
|
||||||
|
other = &prev.RemovedLabels
|
||||||
}
|
}
|
||||||
|
|
||||||
|
appending := true
|
||||||
|
|
||||||
|
for i := 0; i < len(*other); i++ {
|
||||||
|
l := (*other)[i]
|
||||||
|
if l.ID == c.Label.ID {
|
||||||
|
*other = append((*other)[:i], (*other)[i+1:]...)
|
||||||
|
appending = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if appending {
|
||||||
|
*appendingTo = append(*appendingTo, c.Label)
|
||||||
|
}
|
||||||
|
|
||||||
prev.CreatedUnix = c.CreatedUnix
|
prev.CreatedUnix = c.CreatedUnix
|
||||||
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
|
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in New Issue