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

Search: Support multiple order filters (#24230)

Browse Source
This commit is contained in:
Emil Tullstedt
2020-05-06 11:42:52 +02:00
committed by GitHub
parent 9b7bbc3d1c
commit 078d08d036
5 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/services/sqlstore/searchstore/builder.go
View File

@@ -113,13 +113,14 @@ func (b *Builder) applyFilters() (ordering string) {
b.params = append(b.params, groupParams...)
}
if len(orders) > 0 {
orderBy := fmt.Sprintf(" ORDER BY %s", strings.Join(orders, ", "))
b.sql.WriteString(orderBy)
order := strings.Join(orderJoins, "")
order += orderBy
return order
if len(orders) < 1 {
orders = append(orders, TitleSorter{}.OrderBy())
}
return " ORDER BY dashboard.id"
orderBy := fmt.Sprintf(" ORDER BY %s", strings.Join(orders, ", "))
b.sql.WriteString(orderBy)
order := strings.Join(orderJoins, "")
order += orderBy
return order
}