From 80e89a58c1a50bc1626254cbb8f18311baf63cf5 Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch>
Date: Wed, 16 Jan 2019 15:14:33 +0100
Subject: [PATCH] SSDM-6975 : bugfix Dataset visualization on the sample form
---
.../eln-lims/html/js/server/ServerFacade.js | 20 ++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 1613783b368..4f792823e08 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -501,7 +501,12 @@ function ServerFacade(openbisServer) {
if(sampleToSend.id !== -1) { //Is V1 Sample
listDataSetsForV1Sample(sampleToSend);
} else { //Ask for a V1 Sample
- this.searchWithUniqueId(sampleToSend.permId, function(sampleList) {
+ this.searchSamplesV1({
+ "samplePermId" : sampleToSend.permId,
+ "withProperties" : true,
+ "withParents" : true,
+ "withChildren" : true
+ }, function(sampleList) {
listDataSetsForV1Sample(sampleList[0]);
});
}
@@ -1545,8 +1550,17 @@ function ServerFacade(openbisServer) {
}
// Attributes
- if(sampleIdentifier || samplePermId) {
- throw "Unexpected operation exception : v1 search by sampleIdentifier removed";
+ if(sampleIdentifier) {
+ throw "Unexpected operation exception : v1 search by sampleIdentifier and samplePermId removed";
+ }
+
+ if(samplePermId) {
+ matchClauses.push({
+ "@type":"AttributeMatchClause",
+ fieldType : "ATTRIBUTE",
+ attribute : "PERM_ID",
+ desiredValue : samplePermId
+ });
}
if(sampleCode) {
--
GitLab