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
9b6571fa
Commit
9b6571fa
authored
Feb 28, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
template: dont allow template variables to begin with '__'
closes #7678
parent
3ef077c1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
1 deletions
+24
-1
public/app/features/templating/editor_ctrl.ts
+1
-0
public/app/features/templating/partials/editor.html
+4
-1
public/sass/components/_gf-form.scss
+19
-0
No files found.
public/app/features/templating/editor_ctrl.ts
View file @
9b6571fa
...
...
@@ -10,6 +10,7 @@ export class VariableEditorCtrl {
constructor
(
private
$scope
,
private
datasourceSrv
,
private
variableSrv
,
templateSrv
)
{
$scope
.
variableTypes
=
variableTypes
;
$scope
.
ctrl
=
{};
$scope
.
namePattern
=
/^
((?!
__
)
.
)
*$/
;
$scope
.
refreshOptions
=
[
{
value
:
0
,
text
:
"Never"
},
...
...
public/app/features/templating/partials/editor.html
View file @
9b6571fa
...
...
@@ -73,10 +73,13 @@
<form
ng-if=
"mode === 'edit' || mode === 'new'"
name=
"ctrl.form"
>
<h5
class=
"section-heading"
>
Variable
</h5>
<div
class=
"gf-form-group"
>
<div
class=
"gf-form"
ng-show=
"ctrl.form.name.$error.pattern"
>
<span
class=
"gf-form-error"
>
Template names cannot begin with '__' that's reserved for Grafanas global variables
</span>
</div>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-19"
>
<span
class=
"gf-form-label width-6"
>
Name
</span>
<input
type=
"text"
class=
"gf-form-input"
placeholder=
"name"
ng-model=
'current.name'
required
></input>
<input
type=
"text"
class=
"gf-form-input"
name=
"name"
placeholder=
"name"
ng-model=
'current.name'
required
ng-pattern=
"namePattern"
></input>
</div>
<div
class=
"gf-form max-width-19"
>
<span
class=
"gf-form-label width-6"
>
...
...
public/sass/components/_gf-form.scss
View file @
9b6571fa
...
...
@@ -66,6 +66,25 @@ $gf-form-margin: 0.25rem;
}
}
.gf-form-error
{
padding
:
$input-padding-y
$input-padding-x
;
margin-right
:
$gf-form-margin
;
flex-shrink
:
0
;
background-color
:
$input-label-bg
;
display
:
block
;
font-size
:
$font-size-sm
;
margin-right
:
$gf-form-margin
;
border
:
$input-btn-border-width
solid
$red
;
@include
border-radius
(
$label-border-radius-sm
);
&
--grow
{
flex-grow
:
1
;
min-height
:
2
.60rem
;
}
}
.gf-form-checkbox
{
flex-shrink
:
0
;
padding
:
$input-padding-y
$input-padding-x
;
...
...
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