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

fix: templating variable name validation detecting global variable naming wrongly, fixes #8423

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-19 11:14:11 +02:00
parent 9045be5689
commit 878121bb46
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/templating/editor_ctrl.ts
View File

@ -10,7 +10,7 @@ export class VariableEditorCtrl {
constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
$scope.variableTypes = variableTypes;
$scope.ctrl = {};
$scope.namePattern = /^((?!__).)*$/;
$scope.namePattern = /^(?!__).*$/;
$scope.refreshOptions = [
{value: 0, text: "Never"},

10
public/app/features/templating/partials/editor.html
View File

@ -93,10 +93,7 @@
<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-inline">
<div class="gf-form max-width-19">
<span class="gf-form-label width-6">Name</span>
<input type="text" class="gf-form-input" name="name" placeholder="name" ng-model='current.name' required ng-pattern="namePattern"></input>
@ -113,6 +110,11 @@
</div>
</div>
</div>
<div class="gf-form" ng-show="ctrl.form.name.$error.pattern">
<span class="gf-form-label gf-form-label--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">Label</span>

23
public/sass/components/_gf-form.scss
View File

@ -64,6 +64,10 @@ $gf-form-margin: 0.25rem;
flex-grow: 1;
min-height: 2.60rem;
}
&--error {
color: $critical;
}
}
.gf-form-pre {
@ -76,25 +80,6 @@ $gf-form-margin: 0.25rem;
@include border-radius($label-border-radius-sm);
}
.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;