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

2016-04-03 05:32:15 -07:00
parent bcc875a39c
commit a2c6469d41
2 changed files with 2 additions and 1 deletions
@@ -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
 		}