diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5066dce..45003ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [v1.6.2-SNAPSHOT] - 2021-02-08
+
+**Bug Fixes**
+
+[#20446] Catalogue Publishing Widget: field value unexpectedly added in case of optional field
+
+
## [v1.6.1] [r4.24.0] - 2020-06-18
**New Features**
diff --git a/pom.xml b/pom.xml
index be7b9c9..affac91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.portlets.widgets
ckan-metadata-publisher-widget
- 1.6.1
+ 1.6.2-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 34932d7..cf92ac3 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
@@ -679,7 +679,7 @@ public class MetaDataFieldSkeleton extends Composite{
toReturn.add(((TextBox)holder).getText());
else{
- // handle multiselected case
+ // handle single and multi-selected case
for(int i = 0; i < ((ListBox)holder).getItemCount(); i++){
if(((ListBox)holder).isItemSelected(i)){
toReturn.add(((ListBox)holder).getItemText(i));
@@ -687,11 +687,17 @@ public class MetaDataFieldSkeleton extends Composite{
}
// if it was not mandatory but there was no choice, returning empty string
- if(!field.getMandatory())
- if(toReturn.equals("Select " + field.getFieldName())){
- toReturn.clear();
- toReturn.add("");
+ if(!field.getMandatory()) {
+ //Task #20446 - bug fix. Ignoring the placeholder
+ if(toReturn.size()==1) {
+ String placeholder = "Select " + field.getFieldName();
+ if(toReturn.get(0).equals(placeholder)){
+ GWT.log("Skipping placeholder: "+placeholder);
+ toReturn.clear();
+ toReturn.add("");
+ }
}
+ }
}
break;