Rimozione pulsante assegna al ruolo per pratiche in istruttoria

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component

@@ -9,6 +9,15 @@
         <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="portos-kaleo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="portos-mail-manager-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-mail-manager-portlet/docroot/WEB-INF/lib/portos-mail-manager-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/GestioneAttivitaPortlet.java

@@ -255,8 +255,11 @@ public class GestioneAttivitaPortlet extends MVCPortlet {
 					role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), "portos_assegnatore");
 					break;
 				case "Esito":
-					role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), "portos_istruttore");
+					// role =
-					break;
+					// RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(),
+					// "portos_istruttore");
+					// break;
+					return;
 				case "Approvazione":
 					role = RoleLocalServiceUtil.getRole(serviceContext.getCompanyId(), "portos_approvatore");
 					break;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/action_button.jsp

@@ -32,7 +32,6 @@
 <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
 <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%>
 <%@ include file="/html/gestioneattivita/init.jsp" %>
-
 <%
 
 	SearchContainer searchContainer = (SearchContainer) request
@@ -61,7 +60,6 @@
 	        workflowInstanceLink.getWorkflowInstanceId(), false, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
     }
     
-    //long workflowInstanceId = workflowInstanceLink.getWorkflowInstanceId();	
     String randomId = StringUtil.randomId();
     
 	long lastDettPraticaId = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPratica.getIntPraticaId()).getDettPraticaId();
@@ -107,9 +105,12 @@
 			</div>
 		</c:if>
 		<c:if test="<%=WorkflowConstants.STATUS_PENDING == controlloPratica.getStatus()%>">
-			<c:if test="<%=listaTask.size()>0%>">
+			<c:if test="<%= (listaTask.size() > 0)
-				<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.ASSEGNA_AL_RUOLO) %>">
+							&& IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.ASSEGNA_AL_RUOLO)
-					<c:if test="<%=Validator.isNotNull(listaTask.get(0).getAssigneeUserId()) && listaTask.get(0).getAssigneeUserId()!=-1%>">
+					        && Validator.isNotNull(listaTask.get(0).getAssigneeUserId())
+					        && (listaTask.get(0).getAssigneeUserId() != -1)
+					        && (listaTask.get(0).getName().equals(\"Assegnazione\")
+					        	|| listaTask.get(0).getName().equals(\"Approvazione\")) %>">
 				<liferay-portlet:actionURL name="riassegnaAlRuolo" var="riassegnaAlRuoloUrl">
 					<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
 					<liferay-util:param name="workflowTaskId" value="<%=String.valueOf(listaTask.get(0).getWorkflowTaskId())%>" />
@@ -123,35 +124,6 @@
 										url="<%=riassegnaAlRuoloUrl %>" />
 				</div>
 			</c:if>				
-				</c:if>
-				<%
-					boolean assegnazionePossibile = false;
-					for(WorkflowTaskAssignee workflowTaskAssignee: listaTask.get(0).getWorkflowTaskAssignees()){
-					  if(workflowTaskAssignee.getAssigneeClassName().equalsIgnoreCase(Role.class.getName())
-					     && UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(), controlloPratica.getGroupId(), workflowTaskAssignee.getAssigneeClassPK(), true)){
-					    assegnazionePossibile = true;
-					  }
-					}
-				%>
-				<%-- <c:if tst="<%= !listaTask.get(0).getName().equalsIgnoreCase(WorkflowConstants.WORKFLOW_TASKNAME_ESITO) %>">
-					<c:if test="<%=listaTask.get(0).getAssigneeUserId()!=user.getUserId() 
-									&& assegnazionePossibile %>">
-						<liferay-portlet:actionURL name="assegnamiTask" var="assegnamiTaskUrl">
-							<liferay-util:param name="intPraticaId" value="<%=String.valueOf(intPratica.getIntPraticaId()) %>"></liferay-util:param>
-							<liferay-util:param name="workflowTaskId" value="<%=String.valueOf(listaTask.get(0).getWorkflowTaskId())%>" />
-							<liferay-util:param name="controlloPraticaId" value="<%=String.valueOf(controlloPratica.getControlloPraticaId())%>" />
-							<liferay-util:param name="redirect" value="<%=currentURL%>" />
-						</liferay-portlet:actionURL>
-						
-						<div title='<%=LanguageUtil.get(pageContext,"workflow-action-assegna-a-me") %>' class="tooltip-info">
-							<liferay-ui:icon 	iconCssClass="fa fa-user-plus" 
-												linkCssClass="btn btn-action"
-												message="" 
-												url="<%= assegnamiTaskUrl %>" />
-						</div>
-					</c:if>
-				</c:if> --%>
-			</c:if>
 			
 			<c:if test="<%= IntPraticaPermission.contains(permissionChecker, territorioGroupId, ActionKeys.CAMBIO_ISTRUTTORE) %>">
 				<c:if test="<%=Validator.isNotNull(intPratica.getStatusByUserId())%>">											

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component

@@ -2,10 +2,10 @@
     <wb-module deploy-name="portos-fe-portlet">
         <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
-        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
+        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="portos-bo-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar">
+        <dependent-module archiveName="hms-taglib-hook-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/hms-taglib-hook/docroot/WEB-INF/lib/hms-taglib-hook-service.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="portos-fe-portlet"/>