From ec44797aabc5bacf674362d72960c8ec8ff5920e Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Fri, 31 Mar 2023 16:27:09 +0200 Subject: [PATCH] fix visualizzazione descrizione avvisi --- .../service/it/tref/liferay/portos/bo/util/AvvisoUtil.java | 2 +- .../portos-bo-portlet/docroot/WEB-INF/src/service.properties | 4 ++-- .../portos-bo-portlet/docroot/html/cronologia/view.jsp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index e400497e..158706af 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -153,7 +153,7 @@ public class AvvisoUtil { public static String getAvvisoDescription(Avviso avviso){ if(!"MA".equals(avviso.getTipoDocumento())){ if(Validator.isNotNull(avviso.getDescLong())){ - return "
" + avviso.getDescLong(); + return "
" + StringPool.OPEN_PARENTHESIS + avviso.getDescLong() + StringPool.CLOSE_PARENTHESIS; } } return StringPool.BLANK; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index a919a783..279db6b8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2873 - build.date=1680090881093 + build.number=2874 + build.date=1680188065911 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp index c064d7bd..9a2b0731 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp @@ -112,7 +112,7 @@ Date dataEvento = avviso.getDtInvio(); if(Validator.isNotNull(avviso.getDtInvio())){ String tipoEvento = CronostoriaUtil.TIPO_GENIO_CIVILE; - String testoEvento = avviso.getFullDescription(); + String testoEvento = avviso.getFullDescription() + AvvisoUtil.getAvvisoDescription(avviso); String tipoLink = CronostoriaUtil.DOWNLOAD; List links = new ArrayList();