eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Preload namespace so the name can be shown

Browse source
This commit is contained in:
Juan Font 2021-09-03 10:23:26 +02:00
parent 7287e0259c
commit 7ce4738d8a
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
namespaces.go
View file

@ -104,13 +104,17 @@ func (h *Headscale) ListSharedMachinesInNamespace(name string) (*[]Machine, erro
return nil, err
}
sharedNodes := []SharedNode{}
if err := h.db.Preload("Namespace").Preload("Machine").Where(&SharedNode{NamespaceID: n.ID}).Find(&sharedNodes).Error; err != nil {
if err := h.db.Preload("Namespace").Where(&SharedNode{NamespaceID: n.ID}).Find(&sharedNodes).Error; err != nil {
return nil, err
}
machines := []Machine{}
for _, sn := range sharedNodes {
machines = append(machines, sn.Machine)
m, err := h.GetMachineByID(sn.MachineID) // otherwise not everything comes filled
if err != nil {
return nil, err
}
machines = append(machines, *m)
}
return &machines, nil
}