Merge pull request #480 from marmelab/fix_pagination

[RFR] fix pagination
marmelab · Jun 1, 2015 · bf4a775 · bf4a775
2 parents a7cc56d + f3a975a
commit bf4a775
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/javascripts/ng-admin/Crud/list/ListController.js b/src/javascripts/ng-admin/Crud/list/ListController.js
@@ -46,10 +46,21 @@ define(function () {
         progression.start();
 
         this.ReadQueries
-            .getAll(this.view, page, true, this.search, this.sortField, this.sortDir)
-            .then(function (nextData) {
+            .getAll(this.view, page, this.search, this.sortField, this.sortDir)
+            .then(function (response) {
                 progression.done();
-                self.entries = self.entries.concat(nextData.entries);
+                var references = self.view.getReferences();
+
+                self.dataStore.mapEntries(
+                    self.entity.name(),
+                    self.view.identifier(),
+                    self.fields,
+                    response.data
+                ).map(function (entry) {
+                    self.dataStore.fillReferencesValuesFromEntry(entry, references, true);
+                    self.dataStore.addEntry(self.entity.uniqueId, entry);
+                });
+
                 self.loadingPage = false;
             });
     };