public/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-02 14:07:47 +09:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
unreality
2021-10-16 22:31:37 +08:00
committed by GitHub
parent 0603e29c46 a9a1a8fb3c
commit afbfc1d370
23 changed files with 621 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
namespaces.go
View File

@@ -91,7 +91,7 @@ func (h *Headscale) ListMachinesInNamespace(name string) (*[]Machine, error) {
}
machines := []Machine{}
if err := h.db.Preload("AuthKey").Preload("Namespace").Where(&Machine{NamespaceID: n.ID}).Find(&machines).Error; err != nil {
if err := h.db.Preload("AuthKey").Preload("AuthKey.Namespace").Preload("Namespace").Where(&Machine{NamespaceID: n.ID}).Find(&machines).Error; err != nil {
return nil, err
}
return &machines, nil