From c78d65b5a7c646848cf4e5b1b5c55d7261f6e2e8 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 4 Jun 2013 17:53:29 -0400 Subject: [PATCH] BUG 11553 Pausa de casos no se aplica en tareas paralelas SOLVED - Cuando se pausa un hilo el status de todo el caso cambia a PAUSED - Ya no se cambia el status de todo el caso, solo se cierra el hilo pausado - Existe aun un problema con los listados, los cuale sno muestran el estado del caso correctamente, eso se arreglara con el bug 11791 y 12012 --- workflow/engine/classes/class.case.php | 5 ++--- workflow/engine/classes/model/AppCacheView.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 4b84b8635..1cc5a6bfa 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -3776,7 +3776,6 @@ class Cases $oAppDelay = new AppDelay(); $oAppDelay->create($aData); - $aFields['APP_STATUS'] = 'PAUSED'; $oApplication->update($aFields); //update searchindex @@ -5370,13 +5369,13 @@ class Cases while ($aRow = $oDataset->getRow()) { if ($TASK_SOURCE == $aRow['TAS_UID']) { - $delIndex[] = $aRow['DEL_INDEX']; + $delIndex[] = $aRow['DEL_INDEX']; } $oDataset->next(); } $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']); - } + } break; } diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index 15fb6d275..3bd59107b 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -1039,7 +1039,7 @@ class AppCacheView extends BaseAppCacheView $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN")) )->addOr( //Paused - $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "PAUSED")->addAnd( + $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, array("DRAFT", "TO_DO"), Criteria::IN)->addAnd( $criteria->getNewCriterion(AppCacheViewPeer::APP_UID, AppCacheViewPeer::APP_UID . " IN ($sqlAppDelay)", Criteria::CUSTOM)) )->addOr( //Cancelled - getCancelled()