Просмотр исходного кода

fix(templating): fixed issue with custom all value, fixes #4219

Torkel Ödegaard 9 лет назад
Родитель
Сommit
3c30870dc2

+ 1 - 3
public/app/features/templating/editorCtrl.js

@@ -7,7 +7,7 @@ function (angular, _) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('TemplateEditorCtrl', function($scope, datasourceSrv, templateSrv, templateValuesSrv) {
+  module.controller('TemplateEditorCtrl', function($scope, datasourceSrv, templateSrv, templateValuesSrv, $rootScope) {
 
     var replacementDefaults = {
       type: 'query',
@@ -16,9 +16,7 @@ function (angular, _) {
       name: '',
       options: [],
       includeAll: false,
-      allFormat: 'glob',
       multi: false,
-      multiFormat: 'glob',
     };
 
     $scope.init = function() {

+ 1 - 1
public/app/features/templating/partials/editor.html

@@ -189,7 +189,7 @@
 				</div>
 				<div class="gf-form" ng-if="current.includeAll">
 					<span class="gf-form-label width-10">Custom all value</span>
-					<input type="text" class="gf-form-input max-width-15" g-model='current.allValue' placeholder="blank = auto"></input>
+					<input type="text" class="gf-form-input max-width-15" ng-model='current.allValue' placeholder="blank = auto"></input>
 				</div>
 			</div>