IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix user's total count in search (#40415)

Browse Source
This commit is contained in:
Selene 2021-10-14 09:51:32 +02:00 committed by GitHub
parent 665055dbbc
commit a1230f44dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/sqlstore/user.go
View File

@ -654,6 +654,18 @@ func SearchUsers(ctx context.Context, query *models.SearchUsersQuery) error {
countSess.Where(strings.Join(whereConditions, " AND "), whereParams...) countSess.Where(strings.Join(whereConditions, " AND "), whereParams...)
} }
for _, filter := range query.Filters {
if jc := filter.JoinCondition(); jc != nil {
countSess.Join(jc.Operator, jc.Table, jc.Params)
}
if ic := filter.InCondition(); ic != nil {
countSess.In(ic.Condition, ic.Params)
}
if wc := filter.WhereCondition(); wc != nil {
countSess.Where(wc.Condition, wc.Params)
}
}
count, err := countSess.Count(&user) count, err := countSess.Count(&user)
query.Result.TotalCount = count query.Result.TotalCount = count