mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed dashboard search
This commit is contained in:
parent
3e07605260
commit
3f266a3e1b
2
grafana
2
grafana
@ -1 +1 @@
|
|||||||
Subproject commit 49b18e17d7574540cdbf8d208c968ea4db202954
|
Subproject commit a5c8bbfe1f04830507d981dff5a44248ffeab04c
|
@ -55,7 +55,9 @@ func GetDashboard(query *m.GetDashboardQuery) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func SearchDashboards(query *m.SearchDashboardsQuery) error {
|
func SearchDashboards(query *m.SearchDashboardsQuery) error {
|
||||||
sess := x.Limit(100, 0).Where("account_id=?", query.AccountId)
|
titleMatch := "%" + query.Query + "%"
|
||||||
|
|
||||||
|
sess := x.Limit(100, 0).Where("account_id=? AND title LIKE ?", query.AccountId, titleMatch)
|
||||||
sess.Table("Dashboard")
|
sess.Table("Dashboard")
|
||||||
|
|
||||||
query.Result = make([]*m.SearchResult, 0)
|
query.Result = make([]*m.SearchResult, 0)
|
||||||
|
@ -21,7 +21,7 @@ func TestDashboardDataAccess(t *testing.T) {
|
|||||||
Dashboard: map[string]interface{}{
|
Dashboard: map[string]interface{}{
|
||||||
"id": nil,
|
"id": nil,
|
||||||
"title": "test dash 23",
|
"title": "test dash 23",
|
||||||
"tags": make([]interface{}, 0),
|
"tags": []interface{}{"prod", "webapp"},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,6 +49,18 @@ func TestDashboardDataAccess(t *testing.T) {
|
|||||||
So(query.Result.Slug, ShouldEqual, "test-dash-23")
|
So(query.Result.Slug, ShouldEqual, "test-dash-23")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Convey("Should be able to search for dashboard", func() {
|
||||||
|
query := m.SearchDashboardsQuery{
|
||||||
|
Query: "%test%",
|
||||||
|
AccountId: 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
err := SearchDashboards(&query)
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
|
||||||
|
So(len(query.Result), ShouldEqual, 1)
|
||||||
|
})
|
||||||
|
|
||||||
Convey("Should not be able to save dashboard with same name", func() {
|
Convey("Should not be able to save dashboard with same name", func() {
|
||||||
cmd := m.SaveDashboardCommand{
|
cmd := m.SaveDashboardCommand{
|
||||||
AccountId: 1,
|
AccountId: 1,
|
||||||
|
Loading…
Reference in New Issue
Block a user