From 24d69ca205c9f68419cc01d1f06a002550940391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 18 Sep 2017 09:38:02 +0200
Subject: [PATCH] fix: jsonData should not be allowed to be null, fixes #9258

---
 pkg/api/frontendsettings.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 2693d5f9683..563f940904e 100644
--- 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 {