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

Merged in mcuiza/processmaker/HOR-848 (pull request #4150)

Browse Source 
HOR-848
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-25 17:28:09 -04:00
parent 986620b447 f16bff05a2
commit 403a3a873b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/Process.php
View File

@@ -1095,7 +1095,7 @@ class Process extends BaseProcess
$oRuleSet->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oRuleSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while($oRuleSet->next()) { while($oRuleSet->next()) {
$row = $oRuleSet->getRow(); $row = $oRuleSet->getRow();
if(isset($row['USR_UID'])) { if(isset($row['USR_UID']) && $row['USR_UID'] != '' ) {
$usersArray[$row['USR_UID']] = $row['USR_UID']; $usersArray[$row['USR_UID']] = $row['USR_UID'];
} }
$oCase->deleteDelegation($row['APP_UID']); $oCase->deleteDelegation($row['APP_UID']);

4
workflow/engine/methods/processes/processes_DeleteCases.php
View File

@@ -1,7 +1,7 @@
<?php <?php
global $RBAC; global $RBAC;
$RBAC->requirePermissions( 'PM_DELETE_PROCESS_CASES', 'PM_FACTORY' ); $RBAC->requirePermissions( 'PM_DELETE_PROCESS_CASES', 'PM_FACTORY' );
$resp = new StdClass();
try { try {
$uids = explode(',', $_POST['PRO_UIDS']); $uids = explode(',', $_POST['PRO_UIDS']);
$oProcess = new Process(); $oProcess = new Process();
@@ -10,7 +10,6 @@ try {
} }
$oProcess->refreshUserAllCountersByProcessesGroupUid($uids); $oProcess->refreshUserAllCountersByProcessesGroupUid($uids);
$resp = new StdClass();
$resp->status = true; $resp->status = true;
$resp->msg = G::LoadTranslation('ID_ALL_RECORDS_DELETED_SUCESSFULLY'); $resp->msg = G::LoadTranslation('ID_ALL_RECORDS_DELETED_SUCESSFULLY');
@@ -19,6 +18,7 @@ try {
} catch (Exception $e) { } catch (Exception $e) {
$resp->status = false; $resp->status = false;
$resp->msg = $e->getMessage(); $resp->msg = $e->getMessage();
$resp->trace = $e->getTraceAsString();
echo G::json_encode($resp); echo G::json_encode($resp);
} }