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
1ed35f3d
Commit
1ed35f3d
authored
Jan 21, 2019
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: Reverse sanitize variable so it defaults to false
parent
15d560a1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
conf/defaults.ini
+1
-1
pkg/api/frontendsettings.go
+1
-1
pkg/setting/setting.go
+3
-3
public/app/core/config.ts
+2
-2
No files found.
conf/defaults.ini
View file @
1ed35f3d
...
...
@@ -570,7 +570,7 @@ callback_url =
[panels]
enable_alpha
=
false
sanitize_input
=
tru
e
disable_sanitize_input
=
fals
e
[enterprise]
license_path
=
pkg/api/frontendsettings.go
View file @
1ed35f3d
...
...
@@ -166,7 +166,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"externalUserMngLinkUrl"
:
setting
.
ExternalUserMngLinkUrl
,
"externalUserMngLinkName"
:
setting
.
ExternalUserMngLinkName
,
"viewersCanEdit"
:
setting
.
ViewersCanEdit
,
"
sanitizeInput"
:
hs
.
Cfg
.
SanitizeInput
,
"
disableSanitizeInput"
:
hs
.
Cfg
.
Disable
SanitizeInput
,
"buildInfo"
:
map
[
string
]
interface
{}{
"version"
:
setting
.
BuildVersion
,
"commit"
:
setting
.
BuildCommit
,
...
...
pkg/setting/setting.go
View file @
1ed35f3d
...
...
@@ -90,7 +90,7 @@ var (
EmailCodeValidMinutes
int
DataProxyWhiteList
map
[
string
]
bool
DisableBruteForceLoginProtection
bool
SanitizeInput
bool
DisableSanitizeInput
bool
// Snapshots
ExternalSnapshotUrl
string
...
...
@@ -223,7 +223,7 @@ type Cfg struct {
MetricsEndpointBasicAuthUsername
string
MetricsEndpointBasicAuthPassword
string
EnableAlphaPanels
bool
SanitizeInput
bool
DisableSanitizeInput
bool
EnterpriseLicensePath
string
}
...
...
@@ -711,7 +711,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
panels
:=
iniFile
.
Section
(
"panels"
)
cfg
.
EnableAlphaPanels
=
panels
.
Key
(
"enable_alpha"
)
.
MustBool
(
false
)
cfg
.
SanitizeInput
=
panels
.
Key
(
"sanitize_input"
)
.
MustBool
(
tru
e
)
cfg
.
DisableSanitizeInput
=
panels
.
Key
(
"sanitize_input_disabled"
)
.
MustBool
(
fals
e
)
cfg
.
readSessionConfig
()
cfg
.
readSmtpSettings
()
...
...
public/app/core/config.ts
View file @
1ed35f3d
...
...
@@ -35,7 +35,7 @@ export class Settings {
loginHint
:
any
;
loginError
:
any
;
viewersCanEdit
:
boolean
;
s
anitizeInput
:
boolean
;
disableS
anitizeInput
:
boolean
;
constructor
(
options
:
Settings
)
{
const
defaults
=
{
...
...
@@ -53,7 +53,7 @@ export class Settings {
isEnterprise
:
false
,
},
viewersCanEdit
:
false
,
sanitizeInput
:
tru
e
disableSanitizeInput
:
fals
e
};
_
.
extend
(
this
,
defaults
,
options
);
...
...
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