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 15eed2b6867188f726fdba973d1ebe8de173efd2..7a302e3cf887724a1afcdbd61f9943c1ae7061fd 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();