From 10daf1d63a498ff2b1f3f072a573736369925603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 17 Jun 2016 11:22:39 +0200 Subject: [PATCH] Revert "Enable the "limit" param in /api/search" This reverts commit 3d776851082725a4e3b5780cd35bf888348b892f. --- pkg/services/search/handlers.go | 1 - pkg/services/search/models.go | 1 - pkg/services/sqlstore/dashboard.go | 8 +------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/services/search/handlers.go b/pkg/services/search/handlers.go index a8344ba05a5..a4905d6fa58 100644 --- a/pkg/services/search/handlers.go +++ b/pkg/services/search/handlers.go @@ -44,7 +44,6 @@ func searchHandler(query *Query) error { IsStarred: query.IsStarred, OrgId: query.OrgId, DashboardIds: query.DashboardIds, - Limit: query.Limit, } if err := bus.Dispatch(&dashQuery); err != nil { diff --git a/pkg/services/search/models.go b/pkg/services/search/models.go index ada3e1ccdfa..159637013f5 100644 --- a/pkg/services/search/models.go +++ b/pkg/services/search/models.go @@ -42,7 +42,6 @@ type FindPersistedDashboardsQuery struct { UserId int64 IsStarred bool DashboardIds []int - Limit int Result HitList } diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index d71eaeefa6e..ef36fd75ab6 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -123,11 +123,6 @@ type DashboardSearchProjection struct { } func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { - limit := query.Limit - if limit == 0 { - limit = 1000 - } - var sql bytes.Buffer params := make([]interface{}, 0) @@ -170,8 +165,7 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { params = append(params, "%"+query.Title+"%") } - sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT ?")) - params = append(params, limit) + sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT 1000")) var res []DashboardSearchProjection