Browse Source

Added pipe in All Format list.

ubhatnagar 10 years ago
parent
commit
866f48f92d

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

@@ -186,7 +186,7 @@
 									All format
 								</li>
 								<li ng-show="current.includeAll">
-									<select class="input-medium tight-form-input last" ng-model="current.allFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'wildcard', 'regex wildcard', 'regex values', 'lucene']"></select>
+									<select class="input-medium tight-form-input last" ng-model="current.allFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'wildcard', 'regex wildcard', 'regex values', 'lucene', 'pipe']"></select>
 								</li>
 							</ul>
 							<div class="clearfix"></div>

+ 4 - 0
public/app/features/templating/templateValuesSrv.js

@@ -271,6 +271,10 @@ function (angular, _, kbn) {
           }).join('|') + ')';
           break;
         }
+        case 'pipe': {
+          allValue = _.pluck(variable.options, 'text').join('|');
+          break;
+        }
         default: {
           allValue = '{';
           allValue += _.pluck(variable.options, 'text').join(',');