Skip to content

[UI] Hide consecutive additions and removals of the same label #13315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2020
Merged

[UI] Hide consecutive additions and removals of the same label #13315

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5003002
Hide consecutive additions and removals of the same label
pta2002 Oct 26, 2020
b5fab13
fix typo in comment
pta2002 Oct 26, 2020
71b4729
Merge branch 'master' into master
pta2002 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions routers/repo/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2418,11 +2418,34 @@ func combineLabelComments(issue *models.Issue) {
c.AddedLabels[0] = c.Label
}
} 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 {
prev.RemovedLabels = append(prev.RemovedLabels, c.Label)
appendingTo = &prev.RemovedLabels
other = &prev.AddedLabels
} 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
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
continue
Expand Down