From add4f3a54aefc65c7f500df28740d2caf47ca8ed Mon Sep 17 00:00:00 2001 From: francesco Date: Mon, 23 Mar 2020 15:15:22 +0100 Subject: [PATCH] Added patch to fix #18700. Updated pom at 1.6.1 --- changelog.xml | 7 +++++++ pom.xml | 2 +- .../client/ui/metadata/MetaDataFieldSkeleton.java | 11 ++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changelog.xml b/changelog.xml index 7a9510c..c044c97 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,4 +1,11 @@ + + [Feature #18700] Do not skip regex validation on catalogue + item when a field is empty (UI side) + + diff --git a/pom.xml b/pom.xml index 71747bf..7bafbca 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.widgets ckan-metadata-publisher-widget - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT gCube Ckan metadata publisher widget diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java index 65ee168..3351cdc 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java @@ -421,7 +421,16 @@ public class MetaDataFieldSkeleton extends Composite{ * @return a string with the occurred error on error, null otherwise */ public String isFieldValueValid(){ - + + try { + //Feature #18700 + String value = getFieldCurrentValue().get(0); + if(value.isEmpty()) + return checkValidator(value, field.getValidator()) ? null : MALFORMED_ATTRIBUTE; + }catch (Exception e) { + //continue + } + switch(field.getType()){ case Boolean :