Merge pull request #709 from Orckestra/bug/treeselector-select-by-ent…

…ity-token GetProperty returns EntityToken for SystemTreeNodeBinding
Orckestra · Nov 28, 2019 · cc0a3df · cc0a3df
2 parents 44ba5ae + d93cb5a
commit cc0a3df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Website/Composite/content/dialogs/treeselector/TreeSelectorDialogPageBinding.js b/Website/Composite/content/dialogs/treeselector/TreeSelectorDialogPageBinding.js
@@ -601,16 +601,9 @@ TreeSelectorDialogPageBinding.prototype._updateDisplayAndResult = function (tree
 	var prop 		= this._selectionResult;
 
 	selections.each ( function ( binding ) {
-		if (prop == "EntityToken" && binding.node) {
-
-			result.add(
-				binding.node.getEntityToken()
-			);
-		} else {
-			result.add(
-				binding.getProperty(prop)
-			);
-		}
+		result.add(
+			binding.getProperty(prop)
+		);
 		value += binding.getLabel ();
 		if ( selections.hasNext ()) {
 			value += "; ";

diff --git a/Website/Composite/scripts/source/top/ui/bindings/system/SystemTreeNodeBinding.js b/Website/Composite/scripts/source/top/ui/bindings/system/SystemTreeNodeBinding.js
@@ -633,6 +633,19 @@ SystemTreeNodeBinding.prototype.selectToken = function (entityToken) {
 	this.setHandle(this.node.getHandle());
 }
 
+/**
+ * Get bound element attribute or EnityToken.
+ * @overloads {Binding#getProperty}
+ */
+SystemTreeNodeBinding.prototype.getProperty = function ( attname ) {
+
+	if(attname == 'EntityToken' && this.node && this.node.getEntityToken()) {
+		return this.node.getEntityToken();
+	}
+
+	return SystemTreeNodeBinding.superclass.getProperty.call ( this, attname );
+}
+
 /**
  * SystemTreeNodeBinding factory. Notice that we supply a {@link SystemNode} as argument here!
  * @param {SystemNode} node