Fix #32 and minor fixes

mendixlabs · Apr 14, 2017 · a225f68 · a225f68
1 parent 9446639
commit a225f68
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/dist/TreeView.mpk b/dist/TreeView.mpk
diff --git a/src/TreeView/widget/Commons.js b/src/TreeView/widget/Commons.js
@@ -259,7 +259,7 @@ define([
                     throw "Commons.store: Unable to update attribute: " + attr;
                 }
 
-                mx.data[commit === true ? "commit" : "save"]({
+                mx.data.commit({
                     mxobj: object,
                     error: this.error,
                     callback: function () {
@@ -354,9 +354,6 @@ define([
                 }
 
                 mx.ui.action(mfname, {
-                    store: {
-                        caller: context
-                    },
                     params: {
                         applyto: "selection",
                         guids: guids

diff --git a/src/TreeView/widget/TreeView.js b/src/TreeView/widget/TreeView.js
@@ -269,7 +269,7 @@ require([
             var i = 0;
             dojo.forEach(this.types, function (type) {
                 //more householding
-                type.isRefset = type.parentassocsingle == "";
+                type.isRefset = type.parentassocsingle === "" || !type.parentassocsingle;
                 type.assoc = type.isRefset ? type.parentassocmulti : type.parentassocsingle;
 
                 type.index = i++;
@@ -1097,7 +1097,7 @@ require([
             }
             if (!(e in this.dnd.allowDropBefore)) {
                 var x = item.graphNode.xsettings;
-                this.dnd.allowDropBefore[e] = x && mx.meta.getEntity(e).getAttributeType(x.sortattr) == "Float";
+                this.dnd.allowDropBefore[e] = x && mx.meta.getEntity(e).getAttributeType(x.sortattr) == "Decimal";
             }
             return this.dnd.allowDropBefore[e];
         },
@@ -1207,7 +1207,7 @@ require([
 
             //2) update position. Note that this position applies to all assocs! which is a bit weird...
             var x = item.graphNode.xsettings;
-            if (x && mx.meta.getEntity(item.graphNode.type).getAttributeType(x.sortattr) == "Float") {
+            if (x && mx.meta.getEntity(item.graphNode.type).getAttributeType(x.sortattr) == "Decimal") {
                 if (pos == "before" || pos == "after") {
                     //find the other related element for drop in between
                     var othernode = pos == "before" ? target.domNode.previousElementSibling : target.domNode.nextElementSibling;

diff --git a/test/widgets/TreeView.mpk b/test/widgets/TreeView.mpk