ami/tl-vikunja
1
0
Fork 0
Code Activity

Small fixes to manage namespaces

Browse Source
This commit is contained in:
kolaente
2018-07-03 08:48:28 +02:00
parent e0244e28d7
commit 064e1cd3b7
8 changed files with 116 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/lists.go
View File

@ -10,7 +10,7 @@ type List struct {
Created int64 `xorm:"created" json:"created"`
Updated int64 `xorm:"updated" json:"updated"`
Owner User `xorm:"-" json:"owner"`
Owner User `xorm:"-" json:"owner"`
Items []*ListItem `xorm:"-" json:"items"`
}
@ -70,4 +70,4 @@ func GetListsByNamespaceID(nID int64) (lists []*List, err error) {
}
return
}
}

13
models/namespaces_list.go
View File

@ -26,10 +26,10 @@ func CreateOrUpdateNamespace(namespace *Namespace) (err error) {
}
// GetAllNamespacesByUserID does what it says
func GetAllNamespacesByUserID(userID int64) (namespaces []*Namespace, err error) {
func GetAllNamespacesByUserID(userID int64) (namespaces []Namespace, err error) {
// First, get all namespaces which that user owns
err = x.Where("owner_id = ?", userID).Find(namespaces)
err = x.Where("owner_id = ?", userID).Find(&namespaces)
if err != nil {
return namespaces, err
}
@ -39,5 +39,14 @@ func GetAllNamespacesByUserID(userID int64) (namespaces []*Namespace, err error)
Join("INNER", ).
Find(namespaces)*/
// Get user objects
// I couldn't come up with a more performant way to do this...
for in, n := range namespaces {
namespaces[in].Owner, _, err = GetUserByID(n.OwnerID)
if err != nil {
return nil, err
}
}
return
}