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

Merge remote-tracking branch 'upstream/3.0.1.7' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
Dante
2015-12-23 19:20:17 -04:00
parent d4a5d3ce8c 591d4f59c4
commit b043a770a5
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2393,7 +2393,10 @@ class wsBase
$usrasgdUserName = null;
if (isset($val['NEXT_TASK']['USER_ASSIGNED'])) {
$usrasgdUid = $val['NEXT_TASK']['USER_ASSIGNED']['USR_UID'];
$usrasgdUid = '';
if(isset($val['NEXT_TASK']['USER_ASSIGNED']['USR_UID'])){
$usrasgdUid = $val['NEXT_TASK']['USER_ASSIGNED']['USR_UID'];
}
if(isset($val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'])){
$usrasgdUserName = '(' . $val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'] . ')';
}else{
@@ -3143,6 +3146,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 );