diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index 15bd986d..06219689 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -1282,7 +1282,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { notCompleted.add("destinazione"); } if (Validator.isNull(getVia())) { - notCompleted.add("via"); + notCompleted.add("Indirizzo mancante"); } if (Validator.isNull(getLocalizzazioneGeografica()) || getLocalizzazioneGeografica().startsWith("||")) { notCompleted.add("Localizzazione geografica mancante"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index e7baee7e..79d4a685 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -943,7 +943,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); WorkflowTask lastTask = WorkflowUtil.getLastTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null, controlloPratica); - if(lastTask.getName().equalsIgnoreCase("assegnazione")){ +// if(lastTask.getName().equalsIgnoreCase("assegnazione")){ IntPratica intPratica = getIntPratica(intPraticaId); intPratica.setStatusByUserId(istruttoreId); @@ -980,7 +980,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { } catch (Exception e) { _log.error(e, e); } - } +// } } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp index ec1459aa..8552a3b0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp @@ -98,24 +98,22 @@ long territorioGroupId = territorio.getGroupId(); } %> - - - - - - - - -
- -
-
+ + + + + + + +
+ +