From 7789ee4d1586783b9fc2840d04c949639fa7d04a Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Thu, 26 Jul 2012 13:17:08 +0000
Subject: [PATCH] SP-208 / BIS-117 : Automatically convert URL templates on
display
SVN: 26227
---
.../application/ui/vocabulary/VocabularyGrid.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
index 15eed2b6867..7a302e3cf88 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
@@ -59,6 +59,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetCo
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.VocabularyGridColumnIDs;
+import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
@@ -302,8 +303,18 @@ public class VocabularyGrid extends TypedTableGrid<Vocabulary>
FieldUtil.setValueWithUnescaping(descriptionField, vocabulary.getDescription());
addField(descriptionField);
+ String urlTemplate = vocabulary.getURLTemplate();
+ if (urlTemplate != null)
+ {
+ urlTemplate =
+ urlTemplate
+ .replaceAll(
+ BasicConstant.DEPRECATED_VOCABULARY_URL_TEMPLATE_TERM_PATTERN,
+ BasicConstant.VOCABULARY_URL_TEMPLATE_TERM_PATTERN);
+ }
+
urlTemplateField = createURLTemplateField();
- FieldUtil.setValueWithUnescaping(urlTemplateField, vocabulary.getURLTemplate());
+ FieldUtil.setValueWithUnescaping(urlTemplateField, urlTemplate);
addField(urlTemplateField);
chosenFromList = createChosenFromListCheckbox();
--
GitLab