From 3fd98e4c6b92b99f99f65fc70c4410efce445222 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 11 Aug 2016 08:38:35 +0000
Subject: [PATCH] SSDM-4014 : Bugfix Date fields to be deletable
SVN: 36895
---
.../eln-lims/html/js/views/DataSetForm/DataSetFormView.js | 1 +
.../html/js/views/ExperimentForm/ExperimentFormView.js | 1 +
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 1 +
.../eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py | 5 +++--
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 6cfa9cdd1a4..75934aa7f17 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -481,6 +481,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType));
} else if(propertyType.dataType === "TIMESTAMP") {
$component.on("dp.change", changeEvent(propertyType));
+ $component.change(changeEvent(propertyType));
} else {
$component.change(changeEvent(propertyType));
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index cfaa9119ddc..20e7a51af4f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -352,6 +352,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
$component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType));
} else if(propertyType.dataType === "TIMESTAMP") {
$component.on("dp.change", changeEvent(propertyType));
+ $component.change(changeEvent(propertyType));
} else {
$component.change(changeEvent(propertyType));
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 3b202b0ab3d..cf0c23c61d7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -551,6 +551,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
$component = FormUtil.activateRichTextProperties($component, changeEvent(propertyType));
} else if(propertyType.dataType === "TIMESTAMP") {
$component.on("dp.change", changeEvent(propertyType));
+ $component.change(changeEvent(propertyType));
} else {
$component.change(changeEvent(propertyType));
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
index 1d3c7ce3dbd..06dc8de9bca 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
@@ -693,12 +693,13 @@ def insertUpdateSample(tr, parameters, tableBuilder):
if sampleProperties != None:
properties = getProperties(tr, parameters);
for key in sampleProperties.keySet():
- propertyValue = sampleProperties[key];
+ propertyValue = unicode(sampleProperties[key]);
if propertyValue == "":
propertyValue = None;
else:
propertyValue = updateIfIsPropertyRichText(properties, key, propertyValue);
- sample.setPropertyValue(key, unicode(propertyValue));
+ sample.setPropertyValue(key, propertyValue);
+
#Add sample parents
if sampleParents != None:
sample.setParentSampleIdentifiers(sampleParents);
--
GitLab