From 88aca84b494d8d75b3cabb407ad3c77cee4ec991 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 16 Dec 2016 10:25:16 +0000
Subject: [PATCH] SSDM-4537 : Now parents/children table settings are keep
differently for different types
SVN: 37516
---
.../html/js/views/SampleForm/widgets/LinksView.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
index 815b9b24c93..8ae167dd439 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
@@ -123,7 +123,15 @@ function LinksView(linksController, linksModel) {
}
}
- var dataGrid = SampleDataGridUtil.getSampleDataGrid(containerCode, samplesOnGrid, null, linksView.getCustomOperationsForGrid(), allCustomAnnotations, "ANNOTATIONS", linksModel.isDisabled, false);
+ var postFix = null;
+ if(containerCode) {
+ postFix = "ANNOTATIONS";
+ } else {
+ containerCode = mainController.currentView._sampleFormModel.sample.sampleTypeCode;
+ postFix = "ANNOTATIONS_ALL" + linksModel.title;
+ }
+
+ var dataGrid = SampleDataGridUtil.getSampleDataGrid(containerCode, samplesOnGrid, null, linksView.getCustomOperationsForGrid(), allCustomAnnotations, postFix, linksModel.isDisabled, false);
dataGrid.init($dataGridContainer);
linksModel.writeState(sample, null, null, false);
}
--
GitLab