opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 18:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.5.x'

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-09-18 09:40:00 +02:00
parent 7a80a6627a 24d69ca205
commit a687a6605d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/frontendsettings.go
View File

@ -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 {