feat(NgTableParams): better default implementation of getData that fi…

…lters and sorts Use the ngTableDefaultGetData service to apply the `filter`, `orderBy` and paging values of the `NgTableParams` to the `data` array on the `settings` object
esvit · Aug 2, 2015 · 8d91260 · 8d91260
1 parent bdf5d9e
commit 8d91260
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/examples/demo27.html b/examples/demo27.html
@@ -26,12 +26,12 @@ <h1>Table with data passed at init</h1>
     <p><strong>Count per page:</strong> {{tableParams.count()}}
 
 
-        <table ng-table="tableParams" class="table ng-table-responsive">
+        <table ng-table="tableParams" class="table ng-table-responsive" show-filter="true">
             <tr ng-repeat="user in $data">
-                <td data-title="'Name'">
+                <td data-title="'Name'" filter="{ name: 'text'}">
                     {{user.name}}
                 </td>
-                <td data-title="'Age'">
+                <td data-title="'Age'" filter="{ age: 'text'}" sortable="'age'">
                     {{user.age}}
                 </td>
             </tr>
@@ -62,6 +62,7 @@ <h1>Table with data passed at init</h1>
                 page: 1,            // show first page
                 count: 10           // count per page
             }, {
+                showFilter: true,
                 data: data
             });
         })

diff --git a/src/scripts/03-params.js b/src/scripts/03-params.js
@@ -102,7 +102,7 @@ app.value('ngTableDefaults', {
  * @description Parameters manager for ngTable
  */
 
-app.factory('NgTableParams', ['$q', '$log', 'ngTableDefaults', 'ngTableGetDataBcShim', function($q, $log, ngTableDefaults, ngTableGetDataBcShim) {
+app.factory('NgTableParams', ['$q', '$log', 'ngTableDefaults', 'ngTableGetDataBcShim', 'ngTableDefaultGetData', function($q, $log, ngTableDefaults, ngTableGetDataBcShim, ngTableDefaultGetData) {
     var isNumber = function(n) {
         return !isNaN(parseFloat(n)) && isFinite(n);
     };
@@ -304,11 +304,8 @@ app.factory('NgTableParams', ['$q', '$log', 'ngTableDefaults', 'ngTableGetDataBc
          * @param {Object} params New parameters
          */
         this.getData = function(params) {
-            if (angular.isArray(this.data) && angular.isObject(params)) {
-                return this.data.slice((params.page() - 1) * params.count(), params.page() * params.count());
-            } else {
-                return [];
-            }
+            // note: this === settings
+            return ngTableDefaultGetData(this.data, params);
         };
 
         /**