From 9c9691f7af49f146403a443b78f6e117350399be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Fri, 22 Feb 2019 11:18:07 +0100 Subject: [PATCH] Added feature toggle editors_can_own --- pkg/api/frontendsettings.go | 1 + pkg/setting/setting.go | 2 ++ public/app/core/config.ts | 2 ++ 3 files changed, 5 insertions(+) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index d13f0a26ab0..48159e568b6 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -167,6 +167,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf "externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl, "externalUserMngLinkName": setting.ExternalUserMngLinkName, "viewersCanEdit": setting.ViewersCanEdit, + "editorsCanOwn": setting.EditorsCanOwn, "disableSanitizeHtml": hs.Cfg.DisableSanitizeHtml, "buildInfo": map[string]interface{}{ "version": setting.BuildVersion, diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 21899482529..a18b1d14e6a 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -118,6 +118,7 @@ var ( ExternalUserMngInfo string OAuthAutoLogin bool ViewersCanEdit bool + EditorsCanOwn bool // Http auth AdminUser string @@ -657,6 +658,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error { ExternalUserMngLinkName = users.Key("external_manage_link_name").String() ExternalUserMngInfo = users.Key("external_manage_info").String() ViewersCanEdit = users.Key("viewers_can_edit").MustBool(false) + EditorsCanOwn = users.Key("editors_can_own").MustBool(false) // auth auth := iniFile.Section("auth") diff --git a/public/app/core/config.ts b/public/app/core/config.ts index 8839a6f7942..8fefc1aeb0a 100644 --- a/public/app/core/config.ts +++ b/public/app/core/config.ts @@ -36,6 +36,7 @@ export class Settings { loginHint: any; loginError: any; viewersCanEdit: boolean; + editorsCanOwn: boolean; disableSanitizeHtml: boolean; theme: GrafanaTheme; @@ -57,6 +58,7 @@ export class Settings { isEnterprise: false, }, viewersCanEdit: false, + editorsCanOwn: false, disableSanitizeHtml: false, };