partkeepr

commit 576e09196b6f689b57ae51cff8018a1c7cb81494
parent baf169cbf9f221d107df5c298f8756293141982f
Author: Felicia Hummel <felicia@partkeepr.com>
Date:   Fri, 27 Jan 2017 11:42:56 +0100

Reworked association handling, hopefully fixes #800

Diffstat:
M
src/PartKeepr/FrontendBundle/Resources/public/js/Components/ModelTreeMaker/ModelTreeMaker.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/ModelTreeMaker/ModelTreeMaker.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/ModelTreeMaker/ModelTreeMaker.js
@@ -56,7 +56,7 @@ Ext.define("PartKeepr.ModelTreeMaker.ModelTreeMaker", {
         this.visitedModels.push(model.getName());
 
         for (i = 0; i < fields.length; i++) {
-            if (fields[i]["$reference"] === undefined) {
+            if (fields[i]["reference"] === null) {
                 // Field is a scalar field
                 if (this.ignoreFields.indexOf(fields[i].name) === -1 && !this.customFieldIgnorer(fields[i])) {
 
@@ -108,7 +108,7 @@ Ext.define("PartKeepr.ModelTreeMaker.ModelTreeMaker", {
 
         for (i in associations) {
             associationAlreadyProcessed = false;
-            if (typeof(associations[i].storeName) !== "undefined" && associations[i].isMany === true) {
+            if (associations[i].association.name === model.getName() && associations[i].isMany === true) {
                 for (j = 0; j < this.visitedModels.length; j++) {
                     if (this.visitedModels[j] === associations[i].type) {
                        associationAlreadyProcessed = true;