From 9a5d5b2f4f876b4146afc9e633e8dbc193f8ff3a Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 4 Jul 2017 08:39:32 +0000
Subject: [PATCH] SSDM-5274 : More readable links for positions
SVN: 38491
---
.../SampleForm/widgets/StorageListView.js | 41 +++++++++++--------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js
index 1a821473803..9f7f606272a 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js
@@ -30,30 +30,39 @@ function StorageListView(storageListController, storageListModel) {
property : 'link',
isExportable: false,
sortable : false,
+ showByDefault: true,
render : function(data) {
var storagePropertyGroup = profile.getStoragePropertyGroup();
- var displayName = data[storagePropertyGroup.boxProperty] + " : " + data[storagePropertyGroup.positionProperty];
+ var boxProperty = data[storagePropertyGroup.boxProperty];
+ if(!boxProperty) {
+ boxProperty = "NoBox";
+ }
+ var positionProperty = data[storagePropertyGroup.positionProperty];
+ if(!positionProperty) {
+ positionProperty = "NoPos";
+ }
+ var displayName = boxProperty + " : " + positionProperty;
return (data['$object'].newSample)?displayName:FormUtil.getFormLink(displayName, "Sample", data['$object'].permId);
},
filter : function(data, filter) {
return data.identifier.toLowerCase().indexOf(filter) !== -1;
}
});
- columns.push({
- label : 'Identifier',
- property : 'identifier',
- isExportable: true,
- sortable : true,
- filter : function(data, filter) {
- return data.identifier.toLowerCase().indexOf(filter) !== -1;
- },
- sort : function(data1, data2, asc) {
- var value1 = data1.identifier;
- var value2 = data2.identifier;
- var sortDirection = (asc)? 1 : -1;
- return sortDirection * naturalSort(value1, value2);
- }
- });
+// columns.push({
+// label : 'Identifier',
+// property : 'identifier',
+// isExportable: true,
+// sortable : true,
+// filter : function(data, filter) {
+// return data.identifier.toLowerCase().indexOf(filter) !== -1;
+// },
+// sort : function(data1, data2, asc) {
+// var value1 = data1.identifier;
+// var value2 = data2.identifier;
+// var sortDirection = (asc)? 1 : -1;
+// return sortDirection * naturalSort(value1, value2);
+// }
+// });
var storagePropertyCodes = profile.getAllPropertiCodesForTypeCode("STORAGE_POSITION");
var storagePropertyCodesAsMap = {};
--
GitLab