From bfee9b30d19d7536b8da69acec0185df5f3d6df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Thu, 17 Aug 2017 11:05:18 -0400 Subject: [PATCH] HOR-3700 fix when a permission is deleted with a case status defined --- .../processes_DeleteObjectPermission.php | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/workflow/engine/methods/processes/processes_DeleteObjectPermission.php b/workflow/engine/methods/processes/processes_DeleteObjectPermission.php index e473f0ecc..78685d151 100644 --- a/workflow/engine/methods/processes/processes_DeleteObjectPermission.php +++ b/workflow/engine/methods/processes/processes_DeleteObjectPermission.php @@ -22,22 +22,22 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ global $RBAC; -$access = $RBAC->userCanAccess( 'PM_FACTORY' ); +$access = $RBAC->userCanAccess('PM_FACTORY'); if ($access != 1) { switch ($access) { - case - 1: - G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' ); - G::header( 'location: ../login/login' ); + case -1: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); + G::header('location: ../login/login'); die(); break; - case - 2: - G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' ); - G::header( 'location: ../login/login' ); + case -2: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); + G::header('location: ../login/login'); die(); break; default: - G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' ); - G::header( 'location: ../login/login' ); + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); + G::header('location: ../login/login'); die(); break; } @@ -45,20 +45,24 @@ if ($access != 1) { try { require_once 'classes/model/ObjectPermission.php'; $oOP = new ObjectPermission(); - $oOP = ObjectPermissionPeer::retrieveByPK( $_GET['OP_UID'] ); + $oOP = ObjectPermissionPeer::retrieveByPK($_GET['OP_UID']); $sProcessUID = $oOP->getProUid(); $oOP->delete(); + + $result = new stdclass(); $result->success = true; - $result->msg = G::LoadTranslation( 'ID_REPORTTABLE_REMOVED' ); + $result->msg = G::LoadTranslation('ID_REPORTTABLE_REMOVED'); $oProcessMap = new ProcessMap(); - $oProcessMap->getObjectsPermissionsCriteria( $sProcessUID ); + $oProcessMap->getObjectsPermissionsCriteria($sProcessUID); } catch (Exception $e) { + $result = new stdclass(); $result->success = false; $result->msg = $e->getMessage(); } -print G::json_encode( $result ); +print G::json_encode($result); $infoProcess = new Processes(); $resultProcess = $infoProcess->getProcessRow($sProcessUID); -G::auditLog('DeletePermissions','Delete Permissions ('.$_GET['OP_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); +G::auditLog('DeletePermissions', + 'Delete Permissions (' . $_GET['OP_UID'] . ') in Process "' . $resultProcess['PRO_TITLE'] . '"');