Merge branch 'master' into preferences

2016-04-03 05:33:11 -07:00
parent 55d95f9009 a2c6469d41
commit cab859a0e4
6 changed files with 19 additions and 12 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
 		}