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

Merged in qronald/processmaker/HOR-559 (pull request #3983)

Browse Source 
HOR-559
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-30 10:53:02 -04:00
parent 676d896a95 40250a0f67
commit eadca40d08
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.rbac.php
View File

@@ -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"

2
rbac/engine/data/mysql/insert.sql
View File

@@ -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

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

@@ -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);

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

@@ -1,6 +1,6 @@
<?php
global $RBAC;
$RBAC->requirePermissions( 'DELETE_PROCESS_CASES', 'PM_FACTORY' );
$RBAC->requirePermissions( 'PM_DELETE_PROCESS_CASES', 'PM_FACTORY' );
try {
$uids = explode(',', $_POST['PRO_UIDS']);