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

added logic to the micropanel filters in the table panel to handle undefined values better

Browse Source
This commit is contained in:
Spencer Alger 2013-08-30 16:36:12 -07:00
parent df91300bab
commit c9eccf99c8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panels/table/micropanel.html
View File

@ -1,6 +1,6 @@
<a class="close" ng-click="dismiss()" href="">×</a> <a class="close" ng-click="dismiss()" href="">×</a>
<h4> <h4>
Micro Analysis of {{micropanel.field}} Micro Analysis of {{micropanel.field}}
<i class="pointer icon-search" ng-click="fieldExists(micropanel.field,'must');dismiss();"></i> <i class="pointer icon-search" ng-click="fieldExists(micropanel.field,'must');dismiss();"></i>
<i class="pointer icon-ban-circle" ng-click="fieldExists(micropanel.field,'mustNot');dismiss();"></i> <i class="pointer icon-ban-circle" ng-click="fieldExists(micropanel.field,'mustNot');dismiss();"></i>
<br><small>{{micropanel.count}} events in the table set</small> <br><small>{{micropanel.count}} events in the table set</small>
@ -13,7 +13,7 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat='field in micropanel.values'> <tr ng-repeat='field in micropanel.values'>
<td>{{{true: "__blank__",false:field[0]}[field[0] == ""]|tableTruncate:panel.trimFactor:3}}</td> <td>{{{true: "__blank__", false:field[0] }[field[0] == '' || field[0] == undefined]|tableTruncate:panel.trimFactor:3}}</td>
<td style="width:40px"> <td style="width:40px">
<i class="pointer icon-search" ng-click="build_search(micropanel.field,field[0]);dismiss();"></i> <i class="pointer icon-search" ng-click="build_search(micropanel.field,field[0]);dismiss();"></i>
<i class="pointer icon-ban-circle" ng-click="build_search(micropanel.field,field[0],true);dismiss();"></i> <i class="pointer icon-ban-circle" ng-click="build_search(micropanel.field,field[0],true);dismiss();"></i>

3
panels/table/module.js
View File

@ -127,6 +127,9 @@ angular.module('kibana.table', [])
// This needs to be abstracted somewhere // This needs to be abstracted somewhere
if(_.isArray(value)) { if(_.isArray(value)) {
query = "(" + _.map(value,function(v){return angular.toJson(v);}).join(" AND ") + ")"; query = "(" + _.map(value,function(v){return angular.toJson(v);}).join(" AND ") + ")";
} else if (_.isUndefined(value)) {
query = '*';
negate = !negate;
} else { } else {
query = angular.toJson(value); query = angular.toJson(value);
} }