ami/tl-vikunja
1
0
Fork 0
Code Activity

fix: return all users on a list when no search param was provided

Browse Source
This commit is contained in:
kolaente
2022-08-02 15:02:00 +02:00
parent 8f27e7e619
commit c51ee94ad1
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/user/users_list.go
View File

@ -23,13 +23,21 @@ import (
"xorm.io/xorm"
)
type ListUserOpts struct {
AdditionalCond builder.Cond
ReturnAllIfNoSearchProvided bool
}
// ListUsers returns a list with all users, filtered by an optional search string
func ListUsers(s *xorm.Session, search string, additionalCond builder.Cond) (users []*User, err error) {
func ListUsers(s *xorm.Session, search string, opts *ListUserOpts) (users []*User, err error) {
if opts == nil {
opts = &ListUserOpts{}
}
// Prevent searching for placeholders
search = strings.ReplaceAll(search, "%", "")
if search == "" || strings.ReplaceAll(search, " ", "") == "" {
if (search == "" || strings.ReplaceAll(search, " ", "") == "") && !opts.ReturnAllIfNoSearchProvided {
return
}
@ -45,10 +53,10 @@ func ListUsers(s *xorm.Session, search string, additionalCond builder.Cond) (use
),
)
if additionalCond != nil {
if opts.AdditionalCond != nil {
cond = builder.And(
cond,
additionalCond,
opts.AdditionalCond,
)
}