From 40250a0f6710fb797e8dda58ce89577ce765ac7f Mon Sep 17 00:00:00 2001 From: Ronald Q Date: Tue, 29 Mar 2016 16:29:05 -0400 Subject: [PATCH] HOR-559 Delete Cases: En la seccion de permissions se tiene DELETE_PROCESS_CASES y deberia decir PM_DELETE_PROCESS_CASES --- gulliver/system/class.rbac.php | 2 +- rbac/engine/data/mysql/insert.sql | 2 +- workflow/engine/methods/processes/mainInit.php | 2 +- workflow/engine/methods/processes/processes_DeleteCases.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php index 8ffcb6fde..6e8ac688f 100755 --- a/gulliver/system/class.rbac.php +++ b/gulliver/system/class.rbac.php @@ -225,7 +225,7 @@ class RBAC "PM_SETUP_USERS_AUTHENTICATION_SOURCES", "PER_NAME" => "Setup User Authentication Sources" ), array("PER_UID" => "00000000000000000000000000000035", "PER_CODE" => "PM_SETUP_LOGS", "PER_NAME" => "Setup Logs" - ), array("PER_UID" => "00000000000000000000000000000036", "PER_CODE" => "DELETE_PROCESS_CASES", "PER_NAME" => + ), array("PER_UID" => "00000000000000000000000000000036", "PER_CODE" => "PM_DELETE_PROCESS_CASES", "PER_NAME" => "Delete process cases" ), array("PER_UID" => "00000000000000000000000000000037", "PER_CODE" => "PM_EDITPERSONALINFO_CALENDAR", "PER_NAME" => "Edit personal info Calendar" diff --git a/rbac/engine/data/mysql/insert.sql b/rbac/engine/data/mysql/insert.sql index e9ef0eb64..85a714a7d 100755 --- a/rbac/engine/data/mysql/insert.sql +++ b/rbac/engine/data/mysql/insert.sql @@ -34,7 +34,7 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES ('00000000000000000000000000000033','PM_SETUP_PLUGINS','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000034','PM_SETUP_USERS_AUTHENTICATION_SOURCES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000035','PM_SETUP_LOGS','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'), -('00000000000000000000000000000036','DELETE_PROCESS_CASES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'), +('00000000000000000000000000000036','PM_DELETE_PROCESS_CASES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000037','PM_EDITPERSONALINFO_CALENDAR','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'); INSERT INTO `RBAC_ROLES` VALUES diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php index 70f96ee8f..83d7123bd 100755 --- a/workflow/engine/methods/processes/mainInit.php +++ b/workflow/engine/methods/processes/mainInit.php @@ -82,7 +82,7 @@ $oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState()); $deleteCasesFlag = false; global $RBAC; -if($RBAC->userCanAccess('DELETE_PROCESS_CASES') === 1) { +if($RBAC->userCanAccess('PM_DELETE_PROCESS_CASES') === 1) { $deleteCasesFlag = true; } $oHeadPublisher->assign('deleteCasesFlag', $deleteCasesFlag); diff --git a/workflow/engine/methods/processes/processes_DeleteCases.php b/workflow/engine/methods/processes/processes_DeleteCases.php index d90bf3810..337f81d7c 100644 --- a/workflow/engine/methods/processes/processes_DeleteCases.php +++ b/workflow/engine/methods/processes/processes_DeleteCases.php @@ -1,6 +1,6 @@ requirePermissions( 'DELETE_PROCESS_CASES', 'PM_FACTORY' ); +$RBAC->requirePermissions( 'PM_DELETE_PROCESS_CASES', 'PM_FACTORY' ); try { $uids = explode(',', $_POST['PRO_UIDS']);