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

derivequeries: combine derived query with original query using brackets

Browse Source
This commit is contained in:
Nikolay Bryskin 2013-06-12 23:59:09 +04:00
parent a03501031d
commit ac24a06daf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panels/derivequeries/module.js
View File

@ -85,9 +85,9 @@ angular.module('kibana.derivequeries', [])
if ($scope.panel.query === '' || $scope.panel.mode === 'terms only') { if ($scope.panel.query === '' || $scope.panel.mode === 'terms only') {
var suffix = ''; var suffix = '';
} else if ($scope.panel.mode === 'AND') { } else if ($scope.panel.mode === 'AND') {
var suffix = ' AND ' + $scope.panel.query; var suffix = ' AND (' + $scope.panel.query + ')';
} else if ($scope.panel.mode === 'OR') { } else if ($scope.panel.mode === 'OR') {
var suffix = ' OR ' + $scope.panel.query; var suffix = ' OR (' + $scope.panel.query + ')';
} }
_.each(results.facets.query.terms, function(v) { _.each(results.facets.query.terms, function(v) {
data.push($scope.panel.field+':"'+v.term+'"'+suffix) data.push($scope.panel.field+':"'+v.term+'"'+suffix)