Download as
Browse Code »

Commit 9527b6fa553a280db173075e9813541c048b4374

Authored by Carlos Alberto
1 parent 60a1f5df
Exists in master

Correção na execução do workflow

Showing 4 changed files with 6 additions and 5 deletions   Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/ProcessInstanceServiceBaseImpl.java
  Diff comments   View file @9527b6f
... ... @@ -572,7 +572,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl<
572 572 this.addMessage(runtimeEnvironment, processInstance, processInstance.getCreationTemplate(), this.getSubscribersUsers(processInstance), this.getSubscribersGroups(processInstance), null);
573 573 }
574 574  
575   - this.saveOrUpdate(runtimeEnvironment, processInstance, processInstance.isPersistentExecution());
  575 + this.saveOrUpdate(runtimeEnvironment, processInstance, false);
576 576  
577 577 return finalize(runtimeEnvironment, processInstance);
578 578 }
... ... @@ -633,7 +633,7 @@ public abstract class ProcessInstanceServiceBaseImpl extends GenericServiceImpl<
633 633 }
634 634 }
635 635  
636   - this.saveOrUpdate(runtimeEnvironment, processInstance, true);
  636 + this.saveOrUpdate(runtimeEnvironment, processInstance, processInstance.isPersistentExecution());
637 637 this.finalize(runtimeEnvironment, processInstance);
638 638 }
639 639  
... ...
cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
  Diff comments   View file @9527b6f
... ... @@ -2112,6 +2112,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
2112 2112 internacionalizacaoList.add(new Internacionalizacao("ESI.SQL_UPDATE", "SQL Update", dominio, modulo));
2113 2113 internacionalizacaoList.add(new Internacionalizacao("ESI.INCLUIR_SELECIONADOS", "Incluir selecionados", dominio, modulo));
2114 2114 internacionalizacaoList.add(new Internacionalizacao("ESI.DESTINATARIOS", "Destinatários", dominio, modulo));
  2115 + internacionalizacaoList.add(new Internacionalizacao("ESI.TAREFA", "Tarefa", dominio, modulo));
2115 2116  
2116 2117 internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.TIPO_ENGINE_REGRA_DROOLS", "Drools", dominio, modulo));
2117 2118 internacionalizacaoList.add(new Internacionalizacao("ESI.ENUMERADO.TIPO_ESTIMATIVA_TEMPO", "Tempo", dominio, modulo));
... ...
cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/BusinessTaskController.js
  Diff comments   View file @9527b6f
... ... @@ -251,7 +251,7 @@ citApp.controller('BusinessTaskController', ['$scope', 'workflowFilterCriteriaSe
251 251 if (!nome || nome == '')
252 252 nome = $scope.task.flowElement.name;
253 253  
254   - $scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.EXECUTAR')+" "+$translate.instant('LABEL.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
  254 + $scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.EXECUTAR')+" "+$translate.instant('ESI.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
255 255 };
256 256  
257 257 $scope.delegarTarefa = function(assignment){
... ... @@ -276,7 +276,7 @@ citApp.controller('BusinessTaskController', ['$scope', 'workflowFilterCriteriaSe
276 276 if (!nome || nome == '')
277 277 nome = $scope.task.flowElement.name;
278 278  
279   - $scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.DELEGAR')+" "+$translate.instant('LABEL.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
  279 + $scope.addNewWorkspace($translate.instant('ESI.PERMISSAO.DELEGAR')+" "+$translate.instant('ESI.TAREFA').toLowerCase()+" '"+nome+"'", pagina, true, 'mod-red-dark', $scope.task);
280 280 };
281 281  
282 282 $scope.capturarTarefa = function(assignment){
... ...
cit-esi-web/src/main/webapp/html/fluxo/userTaskDetail.html
  Diff comments   View file @9527b6f
... ... @@ -79,7 +79,7 @@
79 79 ng-disabled="true" ng-model="task.id" form="taskDetailForm"/>
80 80 </div>
81 81 <div class='col-md-4'>
82   - <label-input ng-type="text" ng-id="task.flowElement.name" ng-label="LABEL.TAREFA"
  82 + <label-input ng-type="text" ng-id="task.flowElement.name" ng-label="ESI.TAREFA"
83 83 ng-disabled="true" ng-model="task.flowElement.name" form="taskDetailForm"/>
84 84 </div>
85 85 <div class='col-md-2'>
... ...