From 398e90cca25d24caa2823484bc58ae8c1a7b32bc Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 1 Sep 2017 12:02:53 +0000
Subject: [PATCH] SSDM-5536 : Registrator and modifier are not shown in ELN
parents/children tables
SVN: 38691
---
.../html/js/views/DataGrid/SampleDataGridUtil.js | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 7087c6e9896..bcfdc7f549e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -397,11 +397,21 @@ var SampleDataGridUtil = new function() {
for(var sIdx = 0; sIdx < samples.length; sIdx++) {
var sample = samples[sIdx];
+ var registrator = null;
+ if(sample.registrationDetails && sample.registrationDetails.userId) {
+ registrator = sample.registrationDetails.userId;
+ }
+
var registrationDate = null;
if(sample.registrationDetails && sample.registrationDetails.registrationDate) {
registrationDate = Util.getFormatedDate(new Date(sample.registrationDetails.registrationDate));
}
+ var modifier = null;
+ if(sample.registrationDetails && sample.registrationDetails.modifierUserId) {
+ modifier = sample.registrationDetails.modifierUserId;
+ }
+
var modificationDate = null;
if(sample.registrationDetails && sample.registrationDetails.modificationDate) {
modificationDate = Util.getFormatedDate(new Date(sample.registrationDetails.modificationDate));
@@ -414,7 +424,9 @@ var SampleDataGridUtil = new function() {
'default_space' : sample.spaceCode,
'permId' : sample.permId,
'experiment' : sample.experimentIdentifierOrNull,
+ 'registrator' : registrator,
'registrationDate' : registrationDate,
+ 'modifier' : modifier,
'modificationDate' : modificationDate
};
--
GitLab