From d3c93ff5833ee1776346a342e26433fce3c6c13a Mon Sep 17 00:00:00 2001
From: Viktor Kovtun <viktor.kovtun@id.ethz.ch>
Date: Tue, 6 Aug 2019 16:50:51 +0200
Subject: [PATCH] SSDM-8405 Fixing hard-coded data store code.
---
.../eln-lims/1/as/services/publication-api/publication-api.py | 4 +++-
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
index cc5c7e99fe2..0ec4cd80f96 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
@@ -63,13 +63,15 @@ def createDataSet(parameters, sessionToken, v3, sampleId):
dataSetIds = v3.getDataSets(sessionToken, identifiers, DataSetFetchOptions()).keys()
operationLog.debug('Found %d data sets.' % len(dataSetIds))
+ dataStoreCode = parameters.get('dataStoreCode')
+
dataSetCreation = DataSetCreation()
dataSetCreation.setAutoGeneratedCode(True)
dataSetCreation.setTypeId(EntityTypePermId('PUBLICATION_DATA', EntityKind.DATA_SET))
dataSetCreation.setSampleId(sampleId)
dataSetCreation.setDataSetKind(DataSetKind.CONTAINER)
dataSetCreation.setComponentIds(dataSetIds)
- dataSetCreation.setDataStoreId(DataStorePermId('STANDARD'))
+ dataSetCreation.setDataStoreId(DataStorePermId(dataStoreCode))
v3.createDataSets(sessionToken, [dataSetCreation])
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 b9f816840a1..d136521ba3c 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
@@ -327,10 +327,12 @@ function ServerFacade(openbisServer) {
"as/dto/datastore/id/DataStorePermId", "as/dto/service/execute/AggregationServiceExecutionOptions"],
function(ExecuteAggregationServiceOperation, AsynchronousOperationExecutionOptions, DssServicePermId, DataStorePermId,
AggregationServiceExecutionOptions) {
- var dataStoreId = new DataStorePermId("STANDARD");
+ var dataStoreCode = profile.getDefaultDataStoreCode();
+ var dataStoreId = new DataStorePermId(dataStoreCode);
var dssServicePermId = new DssServicePermId(serviceId, dataStoreId);
var options = new AggregationServiceExecutionOptions();
+ options.withParameter("dataStoreCode", dataStoreCode);
options.withParameter("sessionToken", parameters["sessionToken"]);
options.withParameter("entities", parameters["entities"]);
--
GitLab