From d93cb5a08c54dd39f0eb4bb05ccff70e09f776b9 Mon Sep 17 00:00:00 2001 From: Taras Nakonechnyi Date: Thu, 28 Nov 2019 13:42:54 +0200 Subject: [PATCH] GetProperty returns EntityToken for SystemTreeNodeBinding --- .../treeselector/TreeSelectorDialogPageBinding.js | 13 +++---------- .../top/ui/bindings/system/SystemTreeNodeBinding.js | 13 +++++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Website/Composite/content/dialogs/treeselector/TreeSelectorDialogPageBinding.js b/Website/Composite/content/dialogs/treeselector/TreeSelectorDialogPageBinding.js index 271c16cd2f..7cb620f238 100644 --- 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 index 89fd7959b3..b4d115541e 100644 --- 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