From 94c3a07115e035fb1d2cd7196e99021a13285db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 19 Mar 2015 10:32:47 -0400 Subject: [PATCH] Fixed small issue when using 'Save As', dashboard version was not reset --- pkg/models/dashboards.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 4043063278e..7f39dbc74c7 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -14,6 +14,7 @@ var ( ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else") ) +// Dashboard model type Dashboard struct { Id int64 Slug string @@ -27,6 +28,7 @@ type Dashboard struct { Data map[string]interface{} } +// NewDashboard creates a new dashboard func NewDashboard(title string) *Dashboard { dash := &Dashboard{} dash.Data = make(map[string]interface{}) @@ -36,6 +38,7 @@ func NewDashboard(title string) *Dashboard { return dash } +// GetTags turns the tags in data json into go string array func (dash *Dashboard) GetTags() []string { jsonTags := dash.Data["tags"] if jsonTags == nil { @@ -50,6 +53,7 @@ func (dash *Dashboard) GetTags() []string { return b } +// GetDashboardModel turns the command into the savable model func (cmd *SaveDashboardCommand) GetDashboardModel() *Dashboard { dash := &Dashboard{} dash.Data = cmd.Dashboard @@ -63,15 +67,19 @@ func (cmd *SaveDashboardCommand) GetDashboardModel() *Dashboard { if dash.Data["version"] != nil { dash.Version = int(dash.Data["version"].(float64)) } + } else { + dash.Data["version"] = 0 } return dash } +// GetString a func (dash *Dashboard) GetString(prop string) string { return dash.Data[prop].(string) } +// UpdateSlug updates the slug func (dash *Dashboard) UpdateSlug() { title := strings.ToLower(dash.Data["title"].(string)) re := regexp.MustCompile("[^\\w ]+")