partkeepr

commit 56a3ee3fad9a6968fa7ecff06746b9ebe6447c52
parent 11cf89ef6d86718a88ce6448d0c86ff1f9a3efc1
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Sat, 27 May 2017 16:56:00 +0200

Copied FieldSelector code to ModelTreeMaker code. We need to unify this.

Diffstat:
M
src/PartKeepr/FrontendBundle/Resources/public/js/Components/ModelTreeMaker/ModelTreeMaker.js
 | 
2
+-
M
src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/FieldSelector.js
 | 
3
++-

2 files changed, 3 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
@@ -108,7 +108,7 @@ Ext.define("PartKeepr.ModelTreeMaker.ModelTreeMaker", {
 
         for (i in associations) {
             associationAlreadyProcessed = false;
-            if (associations[i].association.name === model.getName() && associations[i].isMany === true) {
+            if (typeof(associations[i].storeName) !== "undefined" && associations[i].isMany === true) {
                 for (j = 0; j < this.visitedModels.length; j++) {
                     if (this.visitedModels[j] === associations[i].type) {
                        associationAlreadyProcessed = true;
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/FieldSelector.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/FieldSelector.js
@@ -88,7 +88,7 @@ Ext.define('PartKeepr.Components.Widgets.FieldSelector', {
                         data: {
                             name: prefix + fields[i].name,
                             type: "field"
-                        },
+                        }
                     };
 
                     if (this.useCheckBoxes) {
@@ -146,6 +146,7 @@ Ext.define('PartKeepr.Components.Widgets.FieldSelector', {
                 if (!associationAlreadyProcessed) {
                     childNode = node.appendChild({
                         text: associations[i].role,
+                        expanded: true,
                         data: {
                             name: prefix + associations[i].role,
                             type: "onetomany",