From 195fd9cfef58c154518e56fd20a7d815bf9da60c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 24 Jan 2017 09:31:07 +0000
Subject: [PATCH] SSDM-4187: dataset-uploader plugin refactored as a
preparation for handling project samples.
SVN: 37616
---
.../1/as/webapps/dataset-uploader/html/index.html | 10 ++++++----
.../dataset-uploader/html/js/DataSetFormController.js | 4 ++--
.../dataset-uploader/html/js/DataSetFormView.js | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
index 843fa0233c4..75b18c0b577 100644
--- a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
+++ b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html
@@ -66,12 +66,14 @@
var context = new openbisWebAppContext();
openBIS.useSession(context.getSessionId());
- var isSharedSample = context.getEntityIdentifier().split("/").length === 2;
- if(context.getEntityKind() === "SAMPLE" && isSharedSample) { //Is sample
+ var isSample = context.getEntityKind() === "SAMPLE";
+ var identifier = context.getEntityIdentifier();
+ var isSharedSample = identifier.split("/").length === 2;
+ if (isSample && isSharedSample) {
$("#dataset-uploader-form").append("This sample does not belong to a space and therefore cannot hold datasets.");
- } else { //Is experiment
+ } else {
var datasetFormController = new DataSetFormController();
- datasetFormController.init($("#dataset-uploader-form"), { identifier : context.getEntityIdentifier() });
+ datasetFormController.init($("#dataset-uploader-form"), {identifier : identifier, isSample : isSample});
}
});
</script>
diff --git a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
index 42f540bd06e..c2b6aa2c941 100644
--- a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
@@ -114,9 +114,9 @@ function DataSetFormController() {
};
var sampleOrExperimentIdentifier = dataSetFormModel.sampleOrExperiment.identifier;
- if(sampleOrExperimentIdentifier.split("/").length === 3) {
+ if (dataSetFormModel.sampleOrExperiment.isSample) {
parameters["sampleIdentifier"] = sampleOrExperimentIdentifier;
- } else if(sampleOrExperimentIdentifier.split("/").length === 4) {
+ } else {
parameters["experimentIdentifier"] = sampleOrExperimentIdentifier;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
index 34e101b3c63..69b4bec5439 100644
--- a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
@@ -52,7 +52,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$dataSetTypeFieldSet.append($dataSetTypeDropDown);
var owner = dataSetFormModel.sampleOrExperiment.identifier;
- var ownerLabel = (owner.split("/").length === 3) ? entityTypes.sample : entityTypes.experiment;
+ var ownerLabel = dataSetFormModel.sampleOrExperiment.isSample ? entityTypes.sample : entityTypes.experiment;
$dataSetTypeFieldSet.append(FormUtil.getFieldForTextWithLabel(owner, ownerLabel));
//
--
GitLab