fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in qronald/processmaker/HOR-294 (pull request #3749)

Browse Source 
HOR-294
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-03 11:37:57 -04:00
parent 7172a08d1e 3af259bb97
commit b461806e09
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.wsBase.php
View File

@@ -2667,9 +2667,10 @@ class wsBase
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( AppDelayPeer::APP_UID );
$oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX );
$oCriteria->addSelectColumn( AppDelayPeer::APP_TYPE );
$oCriteria->addSelectColumn( AppDelayPeer::APP_DISABLE_ACTION_USER );
$oCriteria->addSelectColumn( AppDelayPeer::APP_DISABLE_ACTION_DATE );
$oCriteria->add( AppDelayPeer::APP_TYPE, '' );
$oCriteria->add( AppDelayPeer::APP_UID, $caseId );
$oCriteria->add( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'PAUSE' )->addOr( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'CANCEL' ) ) );
$oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE );
$oDataset = AppDelayPeer::doSelectRS( $oCriteria );
@@ -2678,7 +2679,7 @@ class wsBase
$aRow = $oDataset->getRow();
if (is_array( $aRow )) {
if ($aRow['APP_DISABLE_ACTION_USER'] != 0 && $aRow['APP_DISABLE_ACTION_DATE'] != '') {
if ($aRow['APP_DISABLE_ACTION_USER'] == 0 || is_null($aRow['APP_DISABLE_ACTION_DATE'])) {
$result = new wsResponse( 19, G::loadTranslation( 'ID_CASE_IN_STATUS' ) . " " . $aRow['APP_TYPE'] );
$g->sessionVarRestore();