use current list order to export to csv

marmelab · Apr 1, 2015 · 223cb15 · 223cb15
1 parent c8128c3
commit 223cb15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/javascripts/ng-admin/Crud/button/maExportToCsvButton.js b/src/javascripts/ng-admin/Crud/button/maExportToCsvButton.js
@@ -14,9 +14,8 @@ define(function () {
                 var formatEntry = entryFormater($scope.entity.listView().exportFields());
 
                 $scope.exportToCsv = function () {
-                    var filter = $stateParams.search;
 
-                    RetrieveQueries.getAll($scope.entity.listView(), -1, true, filter).then(function (response) {
+                    RetrieveQueries.getAll($scope.entity.listView(), -1, true, $stateParams.search, $stateParams.sortField, $stateParams.sortDir).then(function (response) {
                         var results = [], entries = response.entries;
                         for (var i = entries.length - 1; i >= 0; i--) {
                             results[i] = formatEntry(entries[i]);

diff --git a/src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js b/src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js
@@ -87,10 +87,13 @@ define(function (require) {
      * @returns {promise} the entity config & the list of objects
      */
     RetrieveQueries.prototype.getRawValues = function (listView, page, filters, sortField, sortDir) {
-        var params = {
-            _page: (typeof (page) === 'undefined') ? 1 : parseInt(page, 10),
-            _perPage: listView.perPage()
-        };
+        var params = {};
+
+        if (page !== -1 ) {
+            params._page = (typeof (page) === 'undefined') ? 1 : parseInt(page, 10);
+            params._perPage = listView.perPage();
+        }
+
         if (sortField && sortField.split('.')[0] === listView.name()) {
             params._sortField = sortField.split('.')[1];
             params._sortDir = sortDir;