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

template: dont allow template variables to begin with '__'

Browse Source 
closes #7678
This commit is contained in:
bergquist 2017-02-28 17:04:47 +01:00
parent 1631c8de95
commit 62eb19a186
3 changed files with 205 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"},

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

@ -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">

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

@ -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;