Prechádzať zdrojové kódy

Merge pull request #3789 from utkarshcmu/snap-bug

Snapshot name is saved in DB now Fixes #3768
Torkel Ödegaard 10 rokov pred
rodič
commit
db1ba30df7

+ 1 - 0
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)
 	}
 

+ 1 - 0
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

+ 1 - 0
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,

+ 1 - 0
public/app/features/dashboard/shareSnapshotCtrl.js

@@ -60,6 +60,7 @@ function (angular, _) {
 
       var cmdData = {
         dashboard: dash,
+        name: dash.title,
         expires: $scope.snapshot.expires,
       };