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

Merged in mcuiza/processmaker/PM-1859 (pull request #1750)

Browse Source 
PM-1859 - Error al ingresar a las reglas de ruteo de un subproceso
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-23 20:48:08 -04:00
parent bfce38c3f8 06777adb89
commit a1b75300b1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.processMap.php
View File

@@ -2500,8 +2500,8 @@ class processMap
// echo $sql; // echo $sql;
// var_dump($aRow); // var_dump($aRow);
// die(); // die();
if (is_array($aRow)) { if (is_array($aRow)) {
$aFields['ROU_TYPE'] = $aRow['ROU_TYPE']; $aFields['ROU_TYPE'] = $aRow['ROU_TYPE'];
$aFields['ROU_TYPE_OLD'] = $aRow['ROU_TYPE']; $aFields['ROU_TYPE_OLD'] = $aRow['ROU_TYPE'];
@@ -2586,6 +2586,9 @@ class processMap
throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE')); throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE'));
break; break;
} }
} else {
throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE'));
} }
$aFields['action'] = 'savePattern'; $aFields['action'] = 'savePattern';

2
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -571,7 +571,7 @@ try {
$taskInfo=$oTaskNewPattern->load($oData->tas_uid); $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
$titleTask=$taskInfo['TAS_TITLE']; $titleTask=$taskInfo['TAS_TITLE'];
G::auditlog("DeleteSubProcess",'Delete Sub-Process -> '.$titleTask.' : '.$oData->tas_uid); G::auditlog("DeleteSubProcess",'Delete Sub-Process -> '.$titleTask.' : '.$oData->tas_uid);
$sOutput = $oProcessMap->deleteSubPrcocess($oData->pro_uid, $oData->tas_uid); $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid);
break; break;
case 'subProcess_Properties': case 'subProcess_Properties':
$oProcessMap->subProcess_Properties($oData->pro_uid, $oData->tas_uid, $oData->index); $oProcessMap->subProcess_Properties($oData->pro_uid, $oData->tas_uid, $oData->index);