Enable the "limit" param in /api/search

Thib17 · Thib17 · commit 3d7768510827 · 2016-06-06T16:15:20.000Z
diff --git a/pkg/services/search/handlers.go b/pkg/services/search/handlers.go
@@ -44,6 +44,7 @@ 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
@@ -42,6 +42,7 @@ 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
@@ -123,6 +123,11 @@ 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)
 
@@ -165,7 +170,8 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error {
 		params = append(params, "%"+query.Title+"%")
 	}
 
-	sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT 1000"))
+	sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT ?"))
+	params = append(params, limit)
 
 	var res []DashboardSearchProjection
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func searchHandler(query *Query) error {`
`44`	`44`	`IsStarred: query.IsStarred,`
`45`	`45`	`OrgId: query.OrgId,`
`46`	`46`	`DashboardIds: query.DashboardIds,`
	`47`	`+ Limit: query.Limit,`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`if err := bus.Dispatch(&dashQuery); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ type FindPersistedDashboardsQuery struct {`
`42`	`42`	`UserId int64`
`43`	`43`	`IsStarred bool`
`44`	`44`	`DashboardIds []int`
	`45`	`+ Limit int`
`45`	`46`
`46`	`47`	`Result HitList`
`47`	`48`	`}`