diff --git a/.classpath b/.classpath index 15db912..d34e57c 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -30,5 +30,5 @@ - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index 0a87b1c..e7bf052 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.2.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-2.2.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 5f54b1f..395bcc3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -28,8 +28,10 @@ - - + + + + @@ -59,7 +61,8 @@ - + + @@ -89,7 +92,8 @@ - + + @@ -119,7 +123,8 @@ - + + @@ -149,7 +154,8 @@ - + + @@ -179,7 +185,8 @@ - + + @@ -209,7 +216,8 @@ - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index a036b49..244629a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,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). +## [v2.2.1-SNAPSHOT] - 2022-06-29 + +#### Enhancements + +- [#23593] Shown the published/unpublished field in the table +- Passed to maven-portal-bom 3.6.4 + ## [v2.2.0] - 2022-06-08 #### Enhancements diff --git a/pom.xml b/pom.xml index 2557ddc..9630588 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-entry-app war - 2.2.0 + 2.2.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 @@ -51,7 +51,7 @@ org.gcube.distribution maven-portal-bom - 3.6.3 + 3.6.4 pom import @@ -145,14 +145,20 @@ metadata-profile-discovery [1.0.0-SNAPSHOT, 1.1.0-SNAPSHOT) - + org.gcube.application geoportal-data-common [1.0.0-SNAPSHOT, 1.5.0-SNAPSHOT) compile - + + + + + + + org.gcube.application geoportal-client diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java index f938fc3..64a94f5 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java @@ -149,6 +149,10 @@ public class ItemsTable extends AbstractItemsCellTable< return dtformat.format(cd); } else if (displayName.equalsIgnoreCase("Created by")) { return ((ConcessioneDV) object).getCreationUser(); + }else if (displayName.toLowerCase().contains("unpub")) { + ValidationReportDV vr = ((ConcessioneDV) object).getValidationReport(); + if (vr != null && vr.getObjectName() != null) + return vr.getObjectName(); } return "";