Просмотр исходного кода

Merge pull request #4779 from bergquist/fix_snapshots

Fix broken snapshots in grafana 2.6
Torkel Ödegaard 9 лет назад
Родитель
Сommit
bd933badb1
2 измененных файлов с 5 добавлено и 1 удалено
  1. 4 0
      pkg/api/dashboard_snapshot.go
  2. 1 1
      pkg/models/dashboard_snapshot.go

+ 4 - 0
pkg/api/dashboard_snapshot.go

@@ -21,6 +21,10 @@ func GetSharingOptions(c *middleware.Context) {
 }
 }
 
 
 func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
 func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
+	if cmd.Name == "" {
+		cmd.Name = "Unnamed snapshot"
+	}
+
 	if cmd.External {
 	if cmd.External {
 		// external snapshot ref requires key and delete key
 		// external snapshot ref requires key and delete key
 		if cmd.Key == "" || cmd.DeleteKey == "" {
 		if cmd.Key == "" || cmd.DeleteKey == "" {

+ 1 - 1
pkg/models/dashboard_snapshot.go

@@ -45,7 +45,7 @@ type DashboardSnapshotDTO struct {
 
 
 type CreateDashboardSnapshotCommand struct {
 type CreateDashboardSnapshotCommand struct {
 	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
 	Dashboard *simplejson.Json `json:"dashboard" binding:"Required"`
-	Name      string           `json:"name" binding:"Required"`
+	Name      string           `json:"name"`
 	Expires   int64            `json:"expires"`
 	Expires   int64            `json:"expires"`
 
 
 	// these are passed when storing an external snapshot ref
 	// these are passed when storing an external snapshot ref