From b720866bdd8c933f4f148d70201be12d017df7a1 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 17 Feb 2017 13:51:16 +0000
Subject: [PATCH] SSDM-4786 : RTF Fields bugfix
SVN: 37767
---
.../eln-lims/html/js/views/DataSetForm/DataSetFormView.js | 2 +-
.../eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js | 2 +-
.../eln-lims/html/js/views/ProjectForm/ProjectFormView.js | 2 +-
.../webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js | 2 +-
4 files changed, 4 insertions(+), 4 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 423352ac3e0..43b8dc5caa6 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
@@ -469,7 +469,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
var timeValue = $($(field.children()[0]).children()[0]).val();
_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = timeValue;
} else {
- if(newValue) {
+ if(newValue !== undefined && newValue !== null) {
_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = Util.getEmptyIfNull(newValue);
} else {
_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = Util.getEmptyIfNull(field.val());
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 c5bfbecae4d..40385ce5960 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
@@ -435,7 +435,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
var timeValue = $($(field.children()[0]).children()[0]).val();
_this._experimentFormModel.experiment.properties[propertyTypeCode] = timeValue;
} else {
- if(newValue) {
+ if(newValue !== undefined && newValue !== null) {
_this._experimentFormModel.experiment.properties[propertyTypeCode] = Util.getEmptyIfNull(newValue);
} else {
_this._experimentFormModel.experiment.properties[propertyTypeCode] = Util.getEmptyIfNull(field.val());
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index fa9d1c38ae4..9fea5495c68 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -143,7 +143,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
var $textBox = FormUtil._getTextBox(null, "Description", false);
var textBoxEvent = function(jsEvent, newValue) {
var valueToUse = null;
- if(newValue) {
+ if(newValue !== undefined && newValue !== null) {
valueToUse = newValue;
} else {
valueToUse = $(this).val();
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 82b375e76e7..3de4c096f9f 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
@@ -604,7 +604,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
var timeValue = $($(field.children()[0]).children()[0]).val();
_this._sampleFormModel.sample.properties[propertyTypeCode] = timeValue;
} else {
- if(newValue) {
+ if(newValue !== undefined && newValue !== null) {
_this._sampleFormModel.sample.properties[propertyTypeCode] = Util.getEmptyIfNull(newValue);
} else {
_this._sampleFormModel.sample.properties[propertyTypeCode] = Util.getEmptyIfNull(field.val());
--
GitLab