From e13d75f200510af44a132e1613e7f860199a041c Mon Sep 17 00:00:00 2001 From: juanf <juanf> Date: Fri, 28 Apr 2017 13:53:17 +0000 Subject: [PATCH] SSDM-4717 : Names show for Objects on their boxes on the storage manager SVN: 38111 --- .../js/views/StorageManager/widgets/StorageView.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js index e05ad2d98b1..50fd52148a3 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/widgets/StorageView.js @@ -214,7 +214,14 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi //Labels var labels = []; samples.forEach(function(element, index, array) { - var code = element.code; + var displayName = null; + var name = element.properties[profile.propertyReplacingCode]; + if(name) { + displayName = element.code +"(" + name + ")"; + } else { + displayName = element.code; + } + var positionProp = element.properties[_this._storageModel.storagePropertyGroup.positionProperty]; if(positionProp) { var positions = positionProp.split(" "); @@ -240,7 +247,7 @@ function StorageView(storageController, storageModel, gridViewRack, gridViewPosi if(_this._storageModel.sample && element.permId === _this._storageModel.sample.permId) { continue; } else { - label = { displayName : code, data : element }; + label = { displayName : displayName, data : element }; col.push(label); } } -- GitLab