fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in julceslau/processmaker/3.0.1-GA (pull request #2514)

Browse Source 
PM-3165 SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-07-24 17:55:14 -04:00
parent f1e3514f5c 150725acd8
commit 8682766395
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/model/AppDelegation.php
View File

@@ -235,10 +235,11 @@ class AppDelegation extends BaseAppDelegation
/* Load the Application Delegation row specified in [app_id] column value.
*
* @param string $AppUid the uid of the application
* @param string $index the index of the delegation
* @return array $Fields the fields
*/
public function LoadParallel ($AppUid)
public function LoadParallel ($AppUid, $index = "")
{
$aCases = array();
@@ -255,6 +256,9 @@ class AppDelegation extends BaseAppDelegation
$c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
$c->add( AppDelegationPeer::APP_UID, $AppUid );
if(!empty($index)) {
$c->add( AppDelegationPeer::DEL_INDEX, $index );
}
$c->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
$rs = AppDelegationPeer::doSelectRS( $c );
$row= $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );

2
workflow/engine/methods/cases/cases_Resume.php
View File

@@ -130,7 +130,7 @@ $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fie
if($Fields['APP_STATUS'] != 'COMPLETED'){
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' );
$objDel = new AppDelegation();
$parallel = $objDel->LoadParallel ($Fields['APP_UID']);
$parallel = $objDel->LoadParallel ($Fields['APP_UID'],$_GET['DEL_INDEX']);
$FieldsPar = $Fields;
if(empty($parallel)){
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task.xml', '', $Fields, '' );