fix(tui): apply sort to group children, not just ungrouped monitors
This commit was merged in pull request #148.
This commit is contained in:
@@ -62,12 +62,6 @@ func sortSitesForDisplay(allSites []models.Site, collapsed map[int]bool, sortCol
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
sort.Slice(groups, func(i, j int) bool { return groups[i].ID < groups[j].ID })
|
sort.Slice(groups, func(i, j int) bool { return groups[i].ID < groups[j].ID })
|
||||||
for pid := range children {
|
|
||||||
c := children[pid]
|
|
||||||
sort.Slice(c, func(i, j int) bool { return c[i].ID < c[j].ID })
|
|
||||||
sort.SliceStable(c, func(i, j int) bool { return siteOrder(c[i]) < siteOrder(c[j]) })
|
|
||||||
children[pid] = c
|
|
||||||
}
|
|
||||||
|
|
||||||
sortSlice := func(s []models.Site) {
|
sortSlice := func(s []models.Site) {
|
||||||
sort.Slice(s, func(i, j int) bool { return s[i].ID < s[j].ID })
|
sort.Slice(s, func(i, j int) bool { return s[i].ID < s[j].ID })
|
||||||
@@ -87,6 +81,12 @@ func sortSitesForDisplay(allSites []models.Site, collapsed map[int]bool, sortCol
|
|||||||
return !less
|
return !less
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for pid := range children {
|
||||||
|
c := children[pid]
|
||||||
|
sortSlice(c)
|
||||||
|
children[pid] = c
|
||||||
|
}
|
||||||
sortSlice(ungrouped)
|
sortSlice(ungrouped)
|
||||||
|
|
||||||
var ordered []models.Site
|
var ordered []models.Site
|
||||||
|
|||||||
Reference in New Issue
Block a user