From c5c61670a352de126ff0f5c7e9c43a93029412c2 Mon Sep 17 00:00:00 2001 From: ThieryMichel Date: Fri, 29 May 2015 17:12:08 +0200 Subject: [PATCH 1/2] fix pagination --- src/javascripts/ng-admin/Crud/list/ListController.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/javascripts/ng-admin/Crud/list/ListController.js b/src/javascripts/ng-admin/Crud/list/ListController.js index 798d6a89..601101ff 100644 --- a/src/javascripts/ng-admin/Crud/list/ListController.js +++ b/src/javascripts/ng-admin/Crud/list/ListController.js @@ -47,9 +47,16 @@ define(function () { this.ReadQueries .getAll(this.view, page, true, this.search, this.sortField, this.sortDir) - .then(function (nextData) { + .then(function (response) { progression.done(); - self.entries = self.entries.concat(nextData.entries); + self.dataStore.mapEntries( + self.entity.name(), + self.view.identifier(), + self.fields, + response.data + ).map(function (entry) { + self.dataStore.addEntry(self.entity.uniqueId, entry); + }); self.loadingPage = false; }); }; From f3a975a03e0539e3d989b1db006f5b638e579508 Mon Sep 17 00:00:00 2001 From: ThieryMichel Date: Mon, 1 Jun 2015 09:33:00 +0200 Subject: [PATCH 2/2] code review --- src/javascripts/ng-admin/Crud/list/ListController.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/javascripts/ng-admin/Crud/list/ListController.js b/src/javascripts/ng-admin/Crud/list/ListController.js index 601101ff..57a9c2fc 100644 --- a/src/javascripts/ng-admin/Crud/list/ListController.js +++ b/src/javascripts/ng-admin/Crud/list/ListController.js @@ -46,17 +46,21 @@ define(function () { progression.start(); this.ReadQueries - .getAll(this.view, page, true, this.search, this.sortField, this.sortDir) + .getAll(this.view, page, this.search, this.sortField, this.sortDir) .then(function (response) { progression.done(); + 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; }); };