|
|
|
|
@ -71,7 +71,6 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa |
|
|
|
|
func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response { |
|
|
|
|
slug := c.Params(":slug") |
|
|
|
|
uid := c.Params(":uid") |
|
|
|
|
trimDefaults := c.QueryBoolWithDefault("trimdefaults", false) |
|
|
|
|
dash, rsp := getDashboardHelper(c.OrgId, slug, 0, uid) |
|
|
|
|
if rsp != nil { |
|
|
|
|
return rsp |
|
|
|
|
@ -176,15 +175,6 @@ func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response { |
|
|
|
|
return response.Error(500, "Error while loading library panels", err) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
var trimedJson simplejson.Json |
|
|
|
|
if trimDefaults && !hs.LoadSchemaService.IsDisabled() { |
|
|
|
|
trimedJson, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash.Data) |
|
|
|
|
if err != nil { |
|
|
|
|
return response.Error(500, "Error while trim default value from dashboard json", err) |
|
|
|
|
} |
|
|
|
|
dash.Data = &trimedJson |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
dto := dtos.DashboardFullWithMeta{ |
|
|
|
|
Dashboard: dash.Data, |
|
|
|
|
Meta: meta, |
|
|
|
|
@ -285,13 +275,6 @@ func (hs *HTTPServer) PostDashboard(c *models.ReqContext, cmd models.SaveDashboa |
|
|
|
|
var err error |
|
|
|
|
cmd.OrgId = c.OrgId |
|
|
|
|
cmd.UserId = c.UserId |
|
|
|
|
trimDefaults := c.QueryBoolWithDefault("trimdefaults", false) |
|
|
|
|
if trimDefaults && !hs.LoadSchemaService.IsDisabled() { |
|
|
|
|
cmd.Dashboard, err = hs.LoadSchemaService.DashboardApplyDefaults(cmd.Dashboard) |
|
|
|
|
if err != nil { |
|
|
|
|
return response.Error(500, "Error while applying default value to the dashboard json", err) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
dash := cmd.GetDashboardModel() |
|
|
|
|
newDashboard := dash.Id == 0 && dash.Uid == "" |
|
|
|
|
if newDashboard { |
|
|
|
|
|