Merge pull request #1223 from julceslauhub/master
BUG 10405 Problemas en la derivacion de subprocesos SOLVED
This commit is contained in:
@@ -166,7 +166,6 @@ a.next {
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<input id="remainingTime" type="hidden" value="<?=$_SERVER["timeRemainUpdate"];?>" />
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
<div id="header">
|
<div id="header">
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ class Derivation
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$aDerivation['NEXT_TASK']['USR_UID'] = '';
|
$aDerivation['NEXT_TASK']['USR_UID'] = '';
|
||||||
|
$aDerivation['NEXT_TASK']['USER_ASSIGNED'] = array('USR_UID' => '');
|
||||||
} else {
|
} else {
|
||||||
//3. load the task information of normal NEXT_TASK
|
//3. load the task information of normal NEXT_TASK
|
||||||
$aDerivation['NEXT_TASK'] = $oTask->load( $aDerivation['ROU_NEXT_TASK'] ); //print $aDerivation['ROU_NEXT_TASK']." **** ".$aDerivation['NEXT_TASK']['TAS_TYPE']."<hr>";
|
$aDerivation['NEXT_TASK'] = $oTask->load( $aDerivation['ROU_NEXT_TASK'] ); //print $aDerivation['ROU_NEXT_TASK']." **** ".$aDerivation['NEXT_TASK']['TAS_TYPE']."<hr>";
|
||||||
@@ -764,7 +765,7 @@ class Derivation
|
|||||||
|
|
||||||
if ($aSP['SP_SYNCHRONOUS'] == 0) {
|
if ($aSP['SP_SYNCHRONOUS'] == 0) {
|
||||||
$this->case->setDelInitDate( $currentDelegation['APP_UID'], $iNewDelIndex );
|
$this->case->setDelInitDate( $currentDelegation['APP_UID'], $iNewDelIndex );
|
||||||
$aDeriveTasks = $this->prepareInformation( array ('USER_UID' => - 1,'APP_UID' => $currentDelegation['APP_UID'],'DEL_INDEX' => $iNewDelIndex
|
$aDeriveTasks = $this->prepareInformation( array ('USER_UID' => -1,'APP_UID' => $currentDelegation['APP_UID'],'DEL_INDEX' => $iNewDelIndex
|
||||||
) );
|
) );
|
||||||
|
|
||||||
if (isset( $aDeriveTasks[1] )) {
|
if (isset( $aDeriveTasks[1] )) {
|
||||||
|
|||||||
Reference in New Issue
Block a user