Merge pull request #68 from rashidkpc/master

Followup to #67

panels/hits/module.js

@@ -58,11 +58,11 @@ angular.module('kibana.hits', [])
     $scope.panel.loading = true;
     $scope.panel.loading = true;
 
 
     // Make sure we have everything for the request to complete
     // Make sure we have everything for the request to complete
-    if(_.isUndefined($scope.panel.index) || _.isUndefined($scope.time))
+    if(_.isUndefined($scope.index) || _.isUndefined($scope.time))
       return
       return
 
 
     var _segment = _.isUndefined(segment) ? 0 : segment
     var _segment = _.isUndefined(segment) ? 0 : segment
-    var request = $scope.ejs.Request().indices($scope.panel.index[_segment]);
+    var request = $scope.ejs.Request().indices($scope.index[_segment]);
     
     
     // Build the question part of the query
     // Build the question part of the query
     var queries = [];
     var queries = [];
@@ -121,7 +121,7 @@ angular.module('kibana.hits', [])
           i++;
           i++;
         });
         });
         $scope.$emit('render');
         $scope.$emit('render');
-        if(_segment < $scope.panel.index.length-1) 
+        if(_segment < $scope.index.length-1) 
           $scope.get_data(_segment+1,query_id)
           $scope.get_data(_segment+1,query_id)
         
         
       }
       }
@@ -143,7 +143,7 @@ angular.module('kibana.hits', [])
 
 
   function set_time(time) {
   function set_time(time) {
     $scope.time = time;
     $scope.time = time;
-    $scope.panel.index = _.isUndefined(time.index) ? $scope.panel.index : time.index
+    $scope.index = _.isUndefined(time.index) ? $scope.index : time.index
     $scope.get_data();
     $scope.get_data();
   }
   }
 
 

panels/table/module.js

@@ -111,7 +111,7 @@ angular.module('kibana.table', [])
     $scope.panel.error =  false;
     $scope.panel.error =  false;
 
 
     // Make sure we have everything for the request to complete
     // Make sure we have everything for the request to complete
-    if(_.isUndefined($scope.panel.index) || _.isUndefined($scope.time))
+    if(_.isUndefined($scope.index) || _.isUndefined($scope.time))
       return
       return
     
     
     $scope.panel.loading = true;
     $scope.panel.loading = true;
@@ -119,7 +119,7 @@ angular.module('kibana.table', [])
     var _segment = _.isUndefined(segment) ? 0 : segment
     var _segment = _.isUndefined(segment) ? 0 : segment
     $scope.segment = _segment;
     $scope.segment = _segment;
 
 
-    var request = $scope.ejs.Request().indices($scope.panel.index[_segment])
+    var request = $scope.ejs.Request().indices($scope.index[_segment])
       .query(ejs.FilteredQuery(
       .query(ejs.FilteredQuery(
         ejs.QueryStringQuery($scope.panel.query || '*'),
         ejs.QueryStringQuery($scope.panel.query || '*'),
         ejs.RangeFilter($scope.time.field)
         ejs.RangeFilter($scope.time.field)
@@ -184,7 +184,7 @@ angular.module('kibana.table', [])
       if(
       if(
           ($scope.data.length < $scope.panel.size*$scope.panel.pages || 
           ($scope.data.length < $scope.panel.size*$scope.panel.pages || 
             !(($scope.panel.sort[0] === $scope.time.field) && $scope.panel.sort[1] === 'desc')) && 
             !(($scope.panel.sort[0] === $scope.time.field) && $scope.panel.sort[1] === 'desc')) && 
-          _segment+1 < $scope.panel.index.length
+          _segment+1 < $scope.index.length
       ) {
       ) {
         $scope.get_data(_segment+1,$scope.query_id)
         $scope.get_data(_segment+1,$scope.query_id)
       }
       }
@@ -196,7 +196,7 @@ angular.module('kibana.table', [])
     $scope.modal = {
     $scope.modal = {
       title: "Table Inspector",
       title: "Table Inspector",
       body : "<h5>Last Elasticsearch Query</h5><pre>"+
       body : "<h5>Last Elasticsearch Query</h5><pre>"+
-          'curl -XGET '+config.elasticsearch+'/'+$scope.panel.index+"/_search?pretty -d'\n"+
+          'curl -XGET '+config.elasticsearch+'/'+$scope.index+"/_search?pretty -d'\n"+
           angular.toJson(JSON.parse(request.toString()),true)+
           angular.toJson(JSON.parse(request.toString()),true)+
         "'</pre>", 
         "'</pre>", 
     } 
     } 
@@ -223,7 +223,7 @@ angular.module('kibana.table', [])
 
 
   function set_time(time) {
   function set_time(time) {
     $scope.time = time;
     $scope.time = time;
-    $scope.panel.index = _.isUndefined(time.index) ? $scope.panel.index : time.index
+    $scope.index = _.isUndefined(time.index) ? $scope.index : time.index
     $scope.get_data();
     $scope.get_data();
   }
   }