refactoring: enterprise build/hooks refactorings (#12478)

This commit is contained in:
Torkel Ödegaard
2018-07-02 04:33:39 -07:00
committed by GitHub
parent 2941dff428
commit b8724ae0c4
13 changed files with 73 additions and 55 deletions

View File

@@ -13,6 +13,7 @@ type IndexViewData struct {
Theme string
NewGrafanaVersionExists bool
NewGrafanaVersion string
AppName string
}
type PluginCss struct {

View File

@@ -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,
},
}

View File

@@ -76,6 +76,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
BuildCommit: setting.BuildCommit,
NewGrafanaVersion: plugins.GrafanaLatestVersion,
NewGrafanaVersionExists: plugins.GrafanaHasUpdate,
AppName: setting.ApplicationName,
}
if setting.DisableGravatar {