Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-28 17:49:41 +02:00
Code Releases Activity

Consistency of store empty result checks

Browse source
This commit is contained in:
sauls8t 2018-03-08 10:51:12 +00:00
parent bd43319bb2
commit e6e099db1a
2 changed files with 674 additions and 668 deletions
Download patch file Download diff file Expand all files Collapse all files

10
domain/user/mysql/store.go
View file

@ -122,7 +122,6 @@ func (s Scope) GetActiveUsersForOrganization(ctx domain.RequestContext) (u []use
err = nil err = nil
u = []user.User{} u = []user.User{}
} }
if err != nil { if err != nil {
err = errors.Wrap(err, fmt.Sprintf("get active users by org %s", ctx.OrgID)) err = errors.Wrap(err, fmt.Sprintf("get active users by org %s", ctx.OrgID))
} }
@ -171,6 +170,10 @@ func (s Scope) GetSpaceUsers(ctx domain.RequestContext, spaceID string) (u []use
ORDER BY u.firstname, u.lastname ORDER BY u.firstname, u.lastname
`, ctx.OrgID, ctx.OrgID, spaceID, ctx.OrgID, spaceID) `, ctx.OrgID, ctx.OrgID, spaceID, ctx.OrgID, spaceID)
if err == sql.ErrNoRows || len(u) == 0 {
err = nil
u = []user.User{}
}
if err != nil { if err != nil {
err = errors.Wrap(err, fmt.Sprintf("get space users for org %s", ctx.OrgID)) err = errors.Wrap(err, fmt.Sprintf("get space users for org %s", ctx.OrgID))
} }
@ -199,6 +202,10 @@ func (s Scope) GetUsersForSpaces(ctx domain.RequestContext, spaces []string) (u
query = s.Runtime.Db.Rebind(query) query = s.Runtime.Db.Rebind(query)
err = s.Runtime.Db.Select(&u, query, args...) err = s.Runtime.Db.Select(&u, query, args...)
if err == sql.ErrNoRows || len(u) == 0 {
err = nil
u = []user.User{}
}
if err != nil { if err != nil {
err = errors.Wrap(err, fmt.Sprintf("get users for spaces for user %s", ctx.UserID)) err = errors.Wrap(err, fmt.Sprintf("get users for spaces for user %s", ctx.UserID))
} }
@ -293,7 +300,6 @@ func (s Scope) MatchUsers(ctx domain.RequestContext, text string, maxMatches int
err = nil err = nil
u = []user.User{} u = []user.User{}
} }
if err != nil { if err != nil {
err = errors.Wrap(err, fmt.Sprintf("matching users for org %s", ctx.OrgID)) err = errors.Wrap(err, fmt.Sprintf("matching users for org %s", ctx.OrgID))
} }

1332
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long