Merge pull request #677 from marmelab/datastore_unique

[RFR] Fix bug with datastore when two references are on the same entity
marmelab · Sep 8, 2015 · 3d20505 · 3d20505
2 parents f358afe + 637128e
commit 3d20505
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/src/javascripts/ng-admin/Crud/routing.js b/src/javascripts/ng-admin/Crud/routing.js
@@ -114,17 +114,15 @@ function routing($stateProvider) {
                         }],
                         referencedEntries: ['dataStore', 'view', 'nonOptimizedReferencedData', 'optimizedReferencedData', function (dataStore, view, nonOptimizedReferencedData, optimizedReferencedData) {
                             var references = view.getReferences(),
-                                referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
-                                referencedEntries;
+                                referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData);
 
                             for (var name in referencedData) {
-                                referencedEntries = Entry.createArrayFromRest(
+                                Entry.createArrayFromRest(
                                     referencedData[name],
                                     [references[name].targetField()],
                                     references[name].targetEntity().name(),
                                     references[name].targetEntity().identifier().name()
-                                );
-                                referencedEntries.map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry));
+                                ).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry));
                             }
 
                             return true;
@@ -180,17 +178,15 @@ function routing($stateProvider) {
                 }],
                 referencedEntries: ['dataStore', 'view', 'nonOptimizedReferencedData', 'optimizedReferencedData', function (dataStore, view, nonOptimizedReferencedData, optimizedReferencedData) {
                     var references = view.getReferences(),
-                        referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
-                        referencedEntries;
+                        referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData);
 
                     for (var name in referencedData) {
-                        referencedEntries = Entry.createArrayFromRest(
+                        Entry.createArrayFromRest(
                             referencedData[name],
                             [references[name].targetField()],
                             references[name].targetEntity().name(),
                             references[name].targetEntity().identifier().name()
-                        );
-                        referencedEntries.map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry))
+                        ).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry))
                     }
 
                     return true;
@@ -211,17 +207,12 @@ function routing($stateProvider) {
                         referencedList = referencedLists[i];
                         referencedListEntries = referencedListData[i];
 
-                        referencedListEntries = Entry.createArrayFromRest(
+                        Entry.createArrayFromRest(
                             referencedListEntries,
                             referencedList.targetFields(),
                             referencedList.targetEntity().name(),
                             referencedList.targetEntity().identifier().name()
-                        );
-
-                        dataStore.setEntries(
-                            referencedList.targetEntity().uniqueId + '_list',
-                            referencedListEntries
-                        );
+                        ).map(entry => dataStore.addEntry(referencedList.targetEntity().uniqueId + '_list', entry));
                     }
                 }],
                 entryWithReferences: ['dataStore', 'view', 'entry', 'referencedEntries', function(dataStore, view, entry, referencedEntries) {
@@ -314,17 +305,15 @@ function routing($stateProvider) {
                 }],
                 referencedEntries: ['dataStore', 'view', 'nonOptimizedReferencedData', 'optimizedReferencedData', function (dataStore, view, nonOptimizedReferencedData, optimizedReferencedData) {
                     var references = view.getReferences(),
-                        referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
-                        referencedEntries;
+                        referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData);
 
                     for (var name in referencedData) {
-                        referencedEntries = Entry.createArrayFromRest(
+                        Entry.createArrayFromRest(
                             referencedData[name],
                             [references[name].targetField()],
                             references[name].targetEntity().name(),
                             references[name].targetEntity().identifier().name()
-                        );
-                        referencedEntries.map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry))
+                        ).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry))
                     }
 
                     return true;

diff --git a/src/javascripts/ng-admin/Main/config/routing.js b/src/javascripts/ng-admin/Main/config/routing.js
@@ -83,21 +83,15 @@ function routing($stateProvider, $urlRouterProvider) {
                                 optimizedReferencedData = optimizedReference;
 
                                 var references = collection.getReferences(),
-                                    referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData),
-                                    referencedEntries;
+                                    referencedData = angular.extend(nonOptimizedReferencedData, optimizedReferencedData);
 
                                 for (var name in referencedData) {
-                                    referencedEntries = Entry.createArrayFromRest(
+                                    Entry.createArrayFromRest(
                                         referencedData[name],
                                         [references[name].targetField()],
                                         references[name].targetEntity().name(),
                                         references[name].targetEntity().identifier().name()
-                                    );
-
-                                    dataStore.setEntries(
-                                        references[name].targetEntity().uniqueId + '_values',
-                                        referencedEntries
-                                    );
+                                    ).map(entry => dataStore.addEntry(references[name].targetEntity().uniqueId + '_values', entry));
                                 }
                             })
                             .then(() => {