Fix undefined when batarang is enabled. Fix individual query counters…

… in histogram panel
elastic · Dec 11, 2013 · 4384772 · 4384772
1 parent 4ce88ee
commit 4384772
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/app/directives/kibanaSimplePanel.js b/src/app/directives/kibanaSimplePanel.js
@@ -60,14 +60,16 @@ function (angular, _) {
             loadController(name);
           });
 
-          $scope.$watch(attr.panel, function (panel) {
-            // If the panel attribute is specified, create a new scope. This ruins configuration
-            // so don't do it with anything that needs to use editor.html
-            if(!_.isUndefined(panel)) {
-              $scope = $scope.$new();
-              $scope.panel = angular.fromJson(panel);
-            }
-          });
+          if(attr.panel) {
+            $scope.$watch(attr.panel, function (panel) {
+              // If the panel attribute is specified, create a new scope. This ruins configuration
+              // so don't do it with anything that needs to use editor.html
+              if(!_.isUndefined(panel)) {
+                $scope = $scope.$new();
+                $scope.panel = angular.fromJson(panel);
+              }
+            });
+          }
         }
       };
     });

diff --git a/src/app/panels/histogram/module.html b/src/app/panels/histogram/module.html
@@ -44,10 +44,10 @@
       <a class='small' ng-click='zoom(2)'><i class='icon-zoom-out'></i> Zoom Out</a> |&nbsp
     </span>
     <span ng-show="panel.legend" ng-repeat='series in legend' class="histogram-legend">
-      <i class='icon-circle' ng-style="{color: series.color}"></i>
+      <i class='icon-circle' ng-style="{color: series.query.color}"></i>
       <span class='small histogram-legend-item'>
-        <span ng-if="panel.show_query">{{series.alias || series.query}}</span>
-        <span ng-if="!panel.show_query">{{series.alias}}</span>
+        <span ng-if="panel.show_query">{{series.query.alias || series.query.query}}</span>
+        <span ng-if="!panel.show_query">{{series.query.alias}}</span>
         <span ng-show="panel.legend_counts"> ({{series.hits}})</span>
       </span>
     </span>

diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js
@@ -425,7 +425,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
               $scope.hits += entry.count; // Entire dataset level hits counter
             });
 
-            $scope.legend[i] = q;
+            $scope.legend[i] = {query:q,hits:hits};
 
             data[i] = {
               info: q,