Browse Source

fix: jsonData should not be allowed to be null, fixes #9258

Torkel Ödegaard 8 years ago
parent
commit
24d69ca205
1 changed files with 2 additions and 0 deletions
  1. 2 0
      pkg/api/frontendsettings.go

+ 2 - 0
pkg/api/frontendsettings.go

@@ -62,6 +62,8 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 
 
 		if ds.JsonData != nil {
 		if ds.JsonData != nil {
 			dsMap["jsonData"] = ds.JsonData
 			dsMap["jsonData"] = ds.JsonData
+		} else {
+			dsMap["jsonData"] = make(map[string]string)
 		}
 		}
 
 
 		if ds.Access == m.DS_ACCESS_DIRECT {
 		if ds.Access == m.DS_ACCESS_DIRECT {