From ff1b71bc20cc0981a38deaf6f2260c3ad6aab3f9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 12 Dec 2017 13:18:00 +0100 Subject: [PATCH 1/2] allow overriding dashboards from api --- pkg/api/dashboard.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 92d4a13d39e..4d2ed4707d9 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -139,6 +139,7 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { Message: cmd.Message, OrgId: c.OrgId, UserId: c.UserId, + Overwrite: cmd.Overwrite, } dashboard, err := dashboards.GetRepository().SaveDashboard(dashItem) From a00af85f36e53be6824e6c21652f45de122861cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Dec 2017 13:21:50 +0100 Subject: [PATCH 2/2] build: fixed unit test failure --- public/app/plugins/datasource/graphite/graphite_query.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/graphite/graphite_query.ts b/public/app/plugins/datasource/graphite/graphite_query.ts index 824b49f8860..a1c4a889efb 100644 --- a/public/app/plugins/datasource/graphite/graphite_query.ts +++ b/public/app/plugins/datasource/graphite/graphite_query.ts @@ -121,7 +121,11 @@ export default class GraphiteQuery { } hasSelectMetric() { - return this.segments[this.segments.length - 1].value === 'select metric'; + if (this.segments.length > 0) { + return this.segments[this.segments.length - 1].value === 'select metric'; + } else { + return false; + } } addFunction(newFunc) {