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

Revert "Enable the "limit" param in /api/search"

Browse Source 
This reverts commit 3d77685108.
This commit is contained in:
Torkel Ödegaard 2016-06-17 11:22:39 +02:00
parent 23aa614baf
commit 10daf1d63a
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/search/handlers.go
View File

@ -44,7 +44,6 @@ func searchHandler(query *Query) error {
IsStarred: query.IsStarred, IsStarred: query.IsStarred,
OrgId: query.OrgId, OrgId: query.OrgId,
DashboardIds: query.DashboardIds, DashboardIds: query.DashboardIds,
Limit: query.Limit,
} }
if err := bus.Dispatch(&dashQuery); err != nil { if err := bus.Dispatch(&dashQuery); err != nil {

1
pkg/services/search/models.go
View File

@ -42,7 +42,6 @@ type FindPersistedDashboardsQuery struct {
UserId int64 UserId int64
IsStarred bool IsStarred bool
DashboardIds []int DashboardIds []int
Limit int
Result HitList Result HitList
} }

8
pkg/services/sqlstore/dashboard.go
View File

@ -123,11 +123,6 @@ type DashboardSearchProjection struct {
} }
func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { func SearchDashboards(query *search.FindPersistedDashboardsQuery) error {
limit := query.Limit
if limit == 0 {
limit = 1000
}
var sql bytes.Buffer var sql bytes.Buffer
params := make([]interface{}, 0) params := make([]interface{}, 0)
@ -170,8 +165,7 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error {
params = append(params, "%"+query.Title+"%") params = append(params, "%"+query.Title+"%")
} }
sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT ?")) sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT 1000"))
params = append(params, limit)
var res []DashboardSearchProjection var res []DashboardSearchProjection