From 70481953fd067f9aaedd2a17b3b74d153640cac2 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Tue, 19 Jan 2016 00:26:20 -0800 Subject: [PATCH] Snapshot name is saved in DB now --- pkg/api/dashboard_snapshot.go | 1 + pkg/models/dashboard_snapshot.go | 5 +++-- pkg/services/sqlstore/dashboard_snapshot.go | 1 + public/app/features/dashboard/shareSnapshotCtrl.js | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index 521dee29a63..33e6014ec46 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -36,6 +36,7 @@ func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapsho cmd.DeleteKey = util.GetRandomString(32) cmd.OrgId = c.OrgId cmd.UserId = c.UserId + cmd.Name = c.Name metrics.M_Api_Dashboard_Snapshot_Create.Inc(1) } diff --git a/pkg/models/dashboard_snapshot.go b/pkg/models/dashboard_snapshot.go index e8f37e2a236..a9e85625c7c 100644 --- a/pkg/models/dashboard_snapshot.go +++ b/pkg/models/dashboard_snapshot.go @@ -25,6 +25,7 @@ type DashboardSnapshot struct { type CreateDashboardSnapshotCommand struct { Dashboard map[string]interface{} `json:"dashboard" binding:"Required"` + Name string `json:"name" binding:"Required"` Expires int64 `json:"expires"` // these are passed when storing an external snapshot ref @@ -32,8 +33,8 @@ type CreateDashboardSnapshotCommand struct { Key string `json:"key"` DeleteKey string `json:"deleteKey"` - OrgId int64 `json:"-"` - UserId int64 `json:"-"` + OrgId int64 `json:"-"` + UserId int64 `json:"-"` Result *DashboardSnapshot } diff --git a/pkg/services/sqlstore/dashboard_snapshot.go b/pkg/services/sqlstore/dashboard_snapshot.go index f4611050a77..5a0e1a740c4 100644 --- a/pkg/services/sqlstore/dashboard_snapshot.go +++ b/pkg/services/sqlstore/dashboard_snapshot.go @@ -24,6 +24,7 @@ func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error { } snapshot := &m.DashboardSnapshot{ + Name: cmd.Name, Key: cmd.Key, DeleteKey: cmd.DeleteKey, OrgId: cmd.OrgId, diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js index 445677d5a12..44c2b3974a6 100644 --- a/public/app/features/dashboard/shareSnapshotCtrl.js +++ b/public/app/features/dashboard/shareSnapshotCtrl.js @@ -60,6 +60,7 @@ function (angular, _) { var cmdData = { dashboard: dash, + name: dash.title, expires: $scope.snapshot.expires, };