From eec7ec33276db6c83cb22a581979aaf9b5f8c140 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 18 Dec 2015 15:59:47 -0400 Subject: [PATCH] PM-4474 PM-4474 PM-4474 PM-4474 PM-4474 --- workflow/engine/classes/class.case.php | 2 +- workflow/engine/classes/class.wsBase.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index be4b44de6..9d19d4af9 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -4176,7 +4176,6 @@ class Cases public function pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate = null) { - $this->CloseCurrentDelegation($sApplicationUID, $iDelegation); $oApplication = new Application(); $aFields = $oApplication->Load($sApplicationUID); //get the appthread row id ( APP_THREAD_INDEX' ) @@ -4194,6 +4193,7 @@ class Cases throw new Exception(G::LoadTranslation("ID_CASE_STOPPED_TRIGGER")); } + $this->CloseCurrentDelegation($sApplicationUID, $iDelegation); //now create a row in APP_DELAY with type PAUSE $aData['PRO_UID'] = $aFields['PRO_UID']; $aData['APP_UID'] = $sApplicationUID; diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 6f0b619d6..715e95170 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -3140,6 +3140,14 @@ class wsBase return $result; } + $oApplication = new Application(); + $aFields = $oApplication->load($caseUid); + if($aFields['APP_STATUS'] == 'DRAFT'){ + $result = new wsResponse( 100, G::LoadTranslation( "ID_CASE_IN_STATUS" ). " DRAFT" ); + $g->sessionVarRestore(); + return $result; + } + $case = new Cases(); $case->cancelCase( $caseUid, $delIndex, $userUid );