Commit a687a660 by Torkel Ödegaard

Merge branch 'v4.5.x'

parents 7a80a662 24d69ca2
...@@ -62,6 +62,8 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment