refactoring: enterprise build/hooks refactorings (#12478)

2018-07-02 04:33:39 -07:00
parent 2941dff428
commit b8724ae0c4
13 changed files with 73 additions and 55 deletions
@@ -132,7 +132,6 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 	}

 	jsonObj := map[string]interface{}{
-		"enterprise":              setting.Enterprise,
 		"defaultDatasource":       defaultDatasource,
 		"datasources":             datasources,
 		"panels":                  panels,
@@ -154,6 +153,7 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 			"latestVersion": plugins.GrafanaLatestVersion,
 			"hasUpdate":     plugins.GrafanaHasUpdate,
 			"env":           setting.Env,
+			"isEnterprise":  setting.IsEnterprise,
 		},
 	}