amigan/stillbox
amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Shares #109

Merged
amigan merged 59 commits from shareUI into trunk 2025-02-14 00:25:03 -05:00
Conversation 0 Commits 59 Files changed 82 +9
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9b55805acd - Show all commits

9
pkg/rest/talkgroups.go
View file

@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/http" "net/http"
"slices"
"dynatron.me/x/stillbox/internal/forms" "dynatron.me/x/stillbox/internal/forms"
"dynatron.me/x/stillbox/pkg/database" "dynatron.me/x/stillbox/pkg/database"
@ -181,6 +182,14 @@ func (tga *talkgroupAPI) getTGsShareRoute(_ ID, w http.ResponseWriter, r *http.R
idSl = append(idSl, id) idSl = append(idSl, id)
} }
slices.SortFunc(idSl, func(a, b talkgroups.ID) int {
if d := int(a.System) - int(b.System); d != 0 {
return d
}
return int(a.Talkgroup) - int(b.Talkgroup)
})
tgRes, err := tgs.TGs(ctx, idSl) tgRes, err := tgs.TGs(ctx, idSl)
if err != nil { if err != nil {
wErr(w, r, autoError(err)) wErr(w, r, autoError(err))