Merge pull request #1782 from julceslauhub/master

BUG 11553 Pausa de casos no se aplica en tareas paralelas SOLVED
This commit is contained in:
julceslauhub
2013-06-04 15:00:19 -07:00
2 changed files with 3 additions and 4 deletions

View File

@@ -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;
}

View File

@@ -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()