Skip to content
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

Jump to bottom

Add highlight to selected repos in milestone dashboard #26300

Merged
merged 8 commits into from
Aug 4, 2023
Merged

Add highlight to selected repos in milestone dashboard #26300

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae56836
fix
yp05327 Aug 3, 2023
c1e41ac
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 3, 2023
3bd2dc9
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
ba634c8
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
ea2d3d8
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
59b4e34
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
68a5a80
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
30cc3ea
Merge branch 'main' into fix-milestone-repo-list-highlight
GiteaBot Aug 4, 2023
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
17 changes: 14 additions & 3 deletions routers/web/user/home.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,19 @@ func Milestones(ctx *context.Context) {
}
}

showRepoIds := make(container.Set[int64], len(showRepos))
for _, repo := range showRepos {
if repo.ID > 0 {
showRepoIds.Add(repo.ID)
}
}
if len(repoIDs) == 0 {
repoIDs = showRepoIds.Values()
}
repoIDs = util.SliceRemoveAllFunc(repoIDs, func(v int64) bool {
return !showRepoIds.Contains(v)
})

var pagerCount int
if isShowClosed {
ctx.Data["State"] = "closed"
Expand All @@ -298,9 +311,7 @@ func Milestones(ctx *context.Context) {
ctx.Data["MilestoneStats"] = milestoneStats
ctx.Data["SortType"] = sortType
ctx.Data["Keyword"] = keyword
if milestoneStats.Total() != totalMilestoneStats.Total() {
ctx.Data["RepoIDs"] = repoIDs
}
ctx.Data["RepoIDs"] = repoIDs
ctx.Data["IsShowClosed"] = isShowClosed

pager := context.NewPagination(pagerCount, setting.UI.IssuePagingNum, page, 5)
Expand Down