From 6681c2accdf8d15dea5f00c7546fd13eea03febc Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 11 May 2011 07:32:09 +0000
Subject: [PATCH] [LMS-2181] minor changes
SVN: 21222
---
.../web/client/application/model/VocabularyTermModel.java | 4 ++--
.../application/ui/field/VocabularyTermSelectionWidget.java | 3 ++-
.../client/web/server/WebClientConfigurationProvider.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
index a43f2d289b6..95d4a0ad2ca 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
@@ -49,12 +49,12 @@ public class VocabularyTermModel extends SimplifiedBaseModel implements
set(ORDINAL, term.getOrdinal());
set(IS_OFFICIAL, term.isOfficial());
set(ModelDataPropertyNames.CODE_WITH_LABEL, term.getCodeOrLabel());
- set(DISPLAY_FIELD, generateDisplatField(term));
+ set(DISPLAY_FIELD, generateDisplayField(term));
set(ModelDataPropertyNames.TOOLTIP, VocabularyPropertyColRenderer.renderAsTooltip(term));
set(ModelDataPropertyNames.OBJECT, term);
}
- public String generateDisplatField(VocabularyTerm term)
+ public String generateDisplayField(VocabularyTerm term)
{
final Element span = DOM.createSpan();
if (false == term.isOfficial())
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
index 85d63c1a731..b3f83432057 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
@@ -92,6 +92,7 @@ public class VocabularyTermSelectionWidget extends
{
long result = 0l;
+ // WORKAROUND for some strange reason getStore().getModels() returns empty list
for (VocabularyTermModel term : VocabularyTermSelectionWidget.this.store.getModels())
{
if (term.getTerm().getOrdinal() > result)
@@ -232,7 +233,7 @@ public class VocabularyTermSelectionWidget extends
final List<VocabularyTermModel> models = new ArrayList<VocabularyTermModel>();
models.addAll(convertItems(terms));
updateStore(models);
- getPropertyEditor().setList(store.getModels());
+ getPropertyEditor().setList(store.getModels()); // see workaround description above
selectInitialValue();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
index b9c69af4c09..82112d7ecf9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProvider.java
@@ -217,7 +217,8 @@ public class WebClientConfigurationProvider
private boolean extractAllowAddingUnofficialTerms(Properties properties)
{
- return PropertyUtils.getBoolean(properties, ALLOW_ADDING_UNOFFICIAL_TERMS, false);
+ return PropertyUtils.getBoolean(properties, ALLOW_ADDING_UNOFFICIAL_TERMS,
+ DEFAULT_ALLOW_ADDING_UNOFFICIAL_TERMS);
}
public WebClientConfiguration getWebClientConfiguration()
--
GitLab