From 32dcb1355618102cce7798941e1357afe298e465 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 18 Jun 2020 12:59:59 +0200 Subject: [PATCH] fixing Feature #18700 --- .../ui/metadata/MetaDataFieldSkeleton.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) 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 3351cdc..34932d7 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 @@ -422,14 +422,14 @@ public class MetaDataFieldSkeleton extends Composite{ */ 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 - } +// try { +// //Feature #18700 +// String value = getFieldCurrentValue().get(0); +// if(field.getMandatory() && value.isEmpty()) +// return checkValidator(value, field.getValidator()) ? null : MALFORMED_ATTRIBUTE; +// }catch (Exception e) { +// //continue +// } switch(field.getType()){ @@ -444,10 +444,11 @@ public class MetaDataFieldSkeleton extends Composite{ if(field.getMandatory()){ - if(!textAreaValue.trim().isEmpty()) + if(!textAreaValue.trim().isEmpty()) { if(field.getValidator() == null || field.getValidator().isEmpty()) return null; // no further check else return checkValidator(textAreaValue, field.getValidator()) ? null : MALFORMED_ATTRIBUTE; + } else return MANDATORY_ATTRIBUTE_MISSING; }else{ @@ -831,7 +832,15 @@ public class MetaDataFieldSkeleton extends Composite{ if(asTag != null && asTag.isCreate()){ List values = getFieldCurrentValue(); for (String value : values) { - generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue())); + + //Feature #18700 + if(value.isEmpty()) { + //if the value is empty I'm adding the tag on in case of onFieldName + if(asTag.getTaggingValue().equals(TaggingGroupingValue.onFieldName)) + generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue())); + }else + generatedTags.add(TaggingGroupingValue.getComposedValueTag(field.getFieldName(), value, asTag.getSeparator(), asTag.getTaggingValue())); + } return generatedTags; }