From 427a971123e9980db531fee4699031f3080d4037 Mon Sep 17 00:00:00 2001
From: kohleman <kohleman>
Date: Wed, 2 Mar 2016 13:13:13 +0000
Subject: [PATCH] SSDM-3286: Fixed the batch update when label column is empty.
The label is then left as it is (NULL) and not set to an empty string ('').
SVN: 35787
---
.../generic/server/business/bo/VocabularyBO.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
index c6737ea44c0..fb4cb955051 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
@@ -83,8 +83,8 @@ public class VocabularyBO extends AbstractBusinessObject implements IVocabularyB
private boolean allowChangingInternallyManaged = false;
public VocabularyBO(final IDAOFactory daoFactory, final Session session,
- IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory,
- DataSetTypeWithoutExperimentChecker dataSetTypeChecker,
+ IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory,
+ DataSetTypeWithoutExperimentChecker dataSetTypeChecker,
IRelationshipService relationshipService)
{
super(daoFactory, session, managedPropertyEvaluatorFactory, dataSetTypeChecker, relationshipService);
@@ -93,8 +93,8 @@ public class VocabularyBO extends AbstractBusinessObject implements IVocabularyB
// For tests only
@Private
VocabularyBO(final IDAOFactory daoFactory, final Session session, VocabularyPE vocabulary,
- IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory,
- DataSetTypeWithoutExperimentChecker dataSetTypeChecker,
+ IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory,
+ DataSetTypeWithoutExperimentChecker dataSetTypeChecker,
IRelationshipService relationshipService)
{
super(daoFactory, session, managedPropertyEvaluatorFactory, dataSetTypeChecker, relationshipService);
@@ -186,7 +186,10 @@ public class VocabularyBO extends AbstractBusinessObject implements IVocabularyB
final VocabularyTermPE vocabularyTermPE = new VocabularyTermPE();
vocabularyTermPE.setCode(code);
vocabularyTermPE.setDescription(description);
- vocabularyTermPE.setLabel(label);
+ if (label.length() > 0)
+ {
+ vocabularyTermPE.setLabel(label);
+ }
vocabularyTermPE.setRegistrator(findPerson());
vocabularyTermPE.setOrdinal(ordinal);
vocabularyTermPE.setOfficial(isOfficial);
--
GitLab