IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-03 05:32:15 -07:00
parent bcc875a39c
commit a2c6469d41
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
### Bug fixes
* **Dashboard**: Fixed dashboard panel layout for mobile devices, fixes [#4529](https://github.com/grafana/grafana/issues/4529)
* **Page Load Crash**: A Datasource with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
# 3.0.0-beta1 (2016-03-31)

2
pkg/api/frontendsettings.go
View File

@ -59,7 +59,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
defaultDatasource = ds.Name
}
if len(ds.JsonData.MustMap()) > 0 {
if ds.JsonData != nil {
dsMap["jsonData"] = ds.JsonData
}