From 9527b6fa553a280db173075e9813541c048b4374 Mon Sep 17 00:00:00 2001
From: Carlos Alberto <carlos.alberto@centralit.com.br>
Date: Thu, 24 Mar 2016 09:31:27 -0300
Subject: [PATCH] Correção na execução do workflow

---
 cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java | 4 ++--
 cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java                                   | 1 +
 cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js                     | 4 ++--
 cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html                                                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java
index a51f069..8bed7af 100644
--- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java
+++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java
@@ -572,7 +572,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl<
 			this.addMessage(runtimeEnvironment, processInstance, processInstance.getCreationTemplate(), this.getSubscribersUsers(processInstance), this.getSubscribersGroups(processInstance), null);
 		}
 
-		this.saveOrUpdate(runtimeEnvironment, processInstance, processInstance.isPersistentExecution());
+		this.saveOrUpdate(runtimeEnvironment, processInstance, false);
 
 		return finalize(runtimeEnvironment, processInstance);
 	}
@@ -633,7 +633,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl<
 			}
 		}
 		
-		this.saveOrUpdate(runtimeEnvironment, processInstance, true);
+		this.saveOrUpdate(runtimeEnvironment, processInstance, processInstance.isPersistentExecution());
 		this.finalize(runtimeEnvironment, processInstance);
 	}
 	
diff --git a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
index 398970a..e83c386 100644
--- a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
+++ b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
@@ -2112,6 +2112,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
 		internacionalizacaoList.add(new Internacionalizacao("ESI.SQL_UPDATE", "SQL Update", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ESI.INCLUIR_SELECIONADOS", "Incluir selecionados", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ESI.DESTINATARIOS", "Destinatários", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ESI.TAREFA", "Tarefa", dominio, modulo));
 		
 		internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.TIPO_ENGINE_REGRA_DROOLS", "Drools", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.TIPO_ESTIMATIVA_TEMPO", "Tempo", dominio, modulo));
diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js
index fb42ce1..8d6d868 100644
--- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js
+++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js
@@ -251,7 +251,7 @@ citApp.controller('BusinessTaskController', ['$scope', 'workflowFilterCriteriaSe
 		if (!nome || nome == '')
 			nome = $scope.task.flowElement.name;
 
-		$scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.EXECUTAR')+" "+$translate.instant('LABEL.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
+		$scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.EXECUTAR')+" "+$translate.instant('ESI.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
 	};
 
 	$scope.delegarTarefa = function(assignment){
@@ -276,7 +276,7 @@ citApp.controller('BusinessTaskController', ['$scope', 'workflowFilterCriteriaSe
 		if (!nome || nome == '')
 			nome = $scope.task.flowElement.name;
 
-		$scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.DELEGAR')+" "+$translate.instant('LABEL.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
+		$scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.DELEGAR')+" "+$translate.instant('ESI.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
 	};
 
 	$scope.capturarTarefa = function(assignment){
diff --git a/cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html b/cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html
index f907c20..6fea38e 100644
--- a/cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html
+++ b/cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html
@@ -79,7 +79,7 @@
 								 ng-disabled="true"  ng-model="task.id" form="taskDetailForm"/>
 				</div>
 				<div class='col-md-4'>
-					<label-input ng-type="text" ng-id="task.flowElement.name" ng-label="LABEL.TAREFA" 
+					<label-input ng-type="text" ng-id="task.flowElement.name" ng-label="ESI.TAREFA" 
 								 ng-disabled="true"  ng-model="task.flowElement.name" form="taskDetailForm"/>
 				</div>
 				<div class='col-md-2'>
--
libgit2 0.21.2