local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix error when searching for a namespace returned no results

Browse source
This commit is contained in:
kolaente 2021-05-26 12:00:55 +02:00
parent 88b9ea6a96
commit 3f6d85497f
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/models/namespace.go
View file

@ -487,6 +487,10 @@ func (n *Namespace) ReadAll(s *xorm.Session, a web.Auth, search string, page int
namespaceIDs, ownerIDs := getNamespaceOwnerIDs(namespaces) namespaceIDs, ownerIDs := getNamespaceOwnerIDs(namespaces)
if len(namespaceIDs) == 0 {
return nil, 0, 0, nil
}
subscriptionsMap, err := getNamespaceSubscriptions(s, namespaceIDs, doer.ID) subscriptionsMap, err := getNamespaceSubscriptions(s, namespaceIDs, doer.ID)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err

10
pkg/models/namespace_test.go
View file

@ -346,4 +346,14 @@ func TestNamespace_ReadAll(t *testing.T) {
// Assert the first namespace is not the favorites namespace // Assert the first namespace is not the favorites namespace
assert.NotEqual(t, SavedFiltersPseudoNamespace.ID, namespaces[0].ID) assert.NotEqual(t, SavedFiltersPseudoNamespace.ID, namespaces[0].ID)
}) })
t.Run("no results", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()
defer s.Close()
n := &Namespace{}
nn, _, _, err := n.ReadAll(s, user1, "some search string which will never return results", 1, -1)
assert.NoError(t, err)
assert.Nil(t, nn)
})
} }