Merge branch 'v4.5.x'

a687a660 · Torkel Ödegaard · 7a80a662 · 24d69ca2 · a687a660
Commit a687a660 authored Sep 18, 2017 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

pkg/api/frontendsettings.go
+2 -0

No files found.
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -62,6 +62,8 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro

 		if ds.JsonData != nil {
 			dsMap["jsonData"] = ds.JsonData
+		} else {
+			dsMap["jsonData"] = make(map[string]string)
 		}

 		if ds.Access == m.DS_ACCESS_DIRECT {