Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
9c9691f7
Commit
9c9691f7
authored
Feb 22, 2019
by
Hugo Häggmark
Committed by
Hugo Häggmark
Feb 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added feature toggle editors_can_own
parent
dafcfd70
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
pkg/api/frontendsettings.go
+1
-0
pkg/setting/setting.go
+2
-0
public/app/core/config.ts
+2
-0
No files found.
pkg/api/frontendsettings.go
View file @
9c9691f7
...
@@ -167,6 +167,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
...
@@ -167,6 +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
,
"disableSanitizeHtml"
:
hs
.
Cfg
.
DisableSanitizeHtml
,
"disableSanitizeHtml"
:
hs
.
Cfg
.
DisableSanitizeHtml
,
"buildInfo"
:
map
[
string
]
interface
{}{
"buildInfo"
:
map
[
string
]
interface
{}{
"version"
:
setting
.
BuildVersion
,
"version"
:
setting
.
BuildVersion
,
...
...
pkg/setting/setting.go
View file @
9c9691f7
...
@@ -118,6 +118,7 @@ var (
...
@@ -118,6 +118,7 @@ var (
ExternalUserMngInfo
string
ExternalUserMngInfo
string
OAuthAutoLogin
bool
OAuthAutoLogin
bool
ViewersCanEdit
bool
ViewersCanEdit
bool
EditorsCanOwn
bool
// Http auth
// Http auth
AdminUser
string
AdminUser
string
...
@@ -657,6 +658,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
...
@@ -657,6 +658,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
)
// auth
// auth
auth
:=
iniFile
.
Section
(
"auth"
)
auth
:=
iniFile
.
Section
(
"auth"
)
...
...
public/app/core/config.ts
View file @
9c9691f7
...
@@ -36,6 +36,7 @@ export class Settings {
...
@@ -36,6 +36,7 @@ export class Settings {
loginHint
:
any
;
loginHint
:
any
;
loginError
:
any
;
loginError
:
any
;
viewersCanEdit
:
boolean
;
viewersCanEdit
:
boolean
;
editorsCanOwn
:
boolean
;
disableSanitizeHtml
:
boolean
;
disableSanitizeHtml
:
boolean
;
theme
:
GrafanaTheme
;
theme
:
GrafanaTheme
;
...
@@ -57,6 +58,7 @@ export class Settings {
...
@@ -57,6 +58,7 @@ export class Settings {
isEnterprise
:
false
,
isEnterprise
:
false
,
},
},
viewersCanEdit
:
false
,
viewersCanEdit
:
false
,
editorsCanOwn
:
false
,
disableSanitizeHtml
:
false
,
disableSanitizeHtml
:
false
,
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment