Fix sorting in settings app. Closes #134 CC: @ppf2

elastic · Jun 18, 2014 · 0add12c · 0add12c
1 parent 8a74cbb
commit 0add12c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/kibana/apps/settings/sections/indices/_edit.html b/src/kibana/apps/settings/sections/indices/_edit.html
@@ -43,17 +43,14 @@ <h1>
         </div>
       </div>
 
-      <paginate list="indexPattern.fields" per-page="20">
+      <paginate list="indexPattern.fields|orderBy:table.by:table.reverse" per-page="20">
         <table class="table">
           <thead>
             <th ng-click="setFieldSort('name')">name <i ng-class="sortClass('name')"></i></th>
             <th ng-click="setFieldSort('type')">type <i ng-class="sortClass('type')"></i></th>
           </thead>
           <tr
-            ng-repeat="field in page
-            | orderBy:table.by:table.reverse
-            | startFrom:table.page*table.max
-            | limitTo:table.max">
+            ng-repeat="field in page">
           <td>
               <span bo-text="field.name"></span>
               &nbsp;

diff --git a/src/kibana/directives/paginate.js b/src/kibana/directives/paginate.js
@@ -18,7 +18,7 @@ define(function (require) {
 
         var getOtherWidth = $parse(attrs.otherWidth);
 
-        $scope.$watch(attrs.list, function (list) {
+        $scope.$watchCollection(attrs.list, function (list) {
           $scope.pages = [];
           if (!list) return;