IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved variable to config struct after PR comments

Browse Source
This commit is contained in:
Hugo Häggmark
2019-02-22 12:11:26 +01:00
committed by Hugo Häggmark
parent 9c9691f7af
commit 769ad21e16
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/frontendsettings.go
View File

@@ -167,7 +167,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl, "externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl,
"externalUserMngLinkName": setting.ExternalUserMngLinkName, "externalUserMngLinkName": setting.ExternalUserMngLinkName,
"viewersCanEdit": setting.ViewersCanEdit, "viewersCanEdit": setting.ViewersCanEdit,
"editorsCanOwn": setting.EditorsCanOwn, "editorsCanOwn": hs.Cfg.EditorsCanOwn,
"disableSanitizeHtml": hs.Cfg.DisableSanitizeHtml, "disableSanitizeHtml": hs.Cfg.DisableSanitizeHtml,
"buildInfo": map[string]interface{}{ "buildInfo": map[string]interface{}{
"version": setting.BuildVersion, "version": setting.BuildVersion,

7
pkg/setting/setting.go
View File

@@ -118,7 +118,6 @@ var (
ExternalUserMngInfo string ExternalUserMngInfo string
OAuthAutoLogin bool OAuthAutoLogin bool
ViewersCanEdit bool ViewersCanEdit bool
EditorsCanOwn bool
// Http auth // Http auth
AdminUser string AdminUser string
@@ -238,6 +237,9 @@ type Cfg struct {
LoginMaxInactiveLifetimeDays int LoginMaxInactiveLifetimeDays int
LoginMaxLifetimeDays int LoginMaxLifetimeDays int
TokenRotationIntervalMinutes int TokenRotationIntervalMinutes int
// User
EditorsCanOwn bool
} }
type CommandLineArgs struct { type CommandLineArgs struct {
@@ -645,6 +647,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
AdminUser = security.Key("admin_user").String() AdminUser = security.Key("admin_user").String()
AdminPassword = security.Key("admin_password").String() AdminPassword = security.Key("admin_password").String()
// users
users := iniFile.Section("users") users := iniFile.Section("users")
AllowUserSignUp = users.Key("allow_sign_up").MustBool(true) AllowUserSignUp = users.Key("allow_sign_up").MustBool(true)
AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true) AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true)
@@ -658,7 +661,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
ExternalUserMngLinkName = users.Key("external_manage_link_name").String() ExternalUserMngLinkName = users.Key("external_manage_link_name").String()
ExternalUserMngInfo = users.Key("external_manage_info").String() ExternalUserMngInfo = users.Key("external_manage_info").String()
ViewersCanEdit = users.Key("viewers_can_edit").MustBool(false) ViewersCanEdit = users.Key("viewers_can_edit").MustBool(false)
EditorsCanOwn = users.Key("editors_can_own").MustBool(false) cfg.EditorsCanOwn = users.Key("editors_can_own").MustBool(false)
// auth // auth
auth := iniFile.Section("auth") auth := iniFile.Section("auth")