diff --git a/.classpath b/.classpath
index 75ff1cc..e619cfc 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -35,5 +35,5 @@
-
+
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 53eb894..384836d 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.1-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c342780..b922d7e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
@@ -14,8 +14,14 @@
-
-
+
+
+
+
+
+
+
+
@@ -31,7 +37,10 @@
-
+
+
+
+
@@ -47,7 +56,10 @@
-
+
+
+
+
@@ -63,7 +75,10 @@
-
+
+
+
+
@@ -79,10 +94,10 @@
-
- uses
-
-
+
+
+
+
@@ -98,7 +113,10 @@
-
+
+
+
+
@@ -114,7 +132,10 @@
-
+
+
+
+
@@ -130,7 +151,10 @@
-
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ccdd19..018334a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
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).
+## [v2.0.1-SNAPSHOT] - 2021-11-17
+
+- [#22369] Just to include the bug fix for Policy and LicenseID in the geoportal-common
+
+
## [v2.0.0] - 2021-09-29
#### Enhancements
diff --git a/pom.xml b/pom.xml
index 5a3031e..a7f1e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.gcube.portlets.user
geoportal-data-entry-app
war
- 2.0.0
+ 2.0.1-SNAPSHOT
GeoPortal Data Entry App
The GeoPortal Data Entry App is an application to build the web forms for data entries needed to GeoNa project
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
index d6ee1ac..cb19a36 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
@@ -211,9 +211,11 @@ public class ConvertToServiceModel {
}
List politicaDiAccessoLst = mapFields.get("Politica di accesso");
+ LOG.debug("Relazione di Scavo: Politica di accesso lst: "+politicaDiAccessoLst);
if (politicaDiAccessoLst != null && politicaDiAccessoLst.size() > 0) {
try {
AccessPolicy ap = AccessPolicy.valueOf(politicaDiAccessoLst.get(0));
+ LOG.debug("Relazione di Scavo: AccessPolicy: "+ap);
relazioneScavo.setPolicy(ap);
} catch (Exception e) {
LOG.warn("I cannot cast " + politicaDiAccessoLst.get(0) + " to " + AccessPolicy.values(), e);
@@ -222,7 +224,9 @@ public class ConvertToServiceModel {
List licenzaIdList = mapFields.get("ID Licenza");
if (licenzaIdList != null && licenzaIdList.size() > 0) {
+ LOG.debug("Relazione di Scavo: ID Licenza lst: "+licenzaIdList);
relazioneScavo.setLicenseID(licenzaIdList.get(0));
+ LOG.debug("Relazione di Scavo: ID Licenza: "+relazioneScavo.getLicenseID());
}
// TODO