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

Merge branch 'MT-10' of bitbucket.org:colosa/processmaker into MT-10

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2016-04-01 11:30:58 -04:00
parent ec8ed31d73 56127d4a47
commit 28c36c85d1
17 changed files with 3267 additions and 3083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/cases_Step.php
View File

@@ -215,7 +215,7 @@ if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arra
$ieVersion = intval($arrayMatch[1]);
}
if (isset( $_GET['breakpoint'] ) && $ieVersion != 11) {
if (isset($_GET['breakpoint'])) {
$G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameLoader' );
$G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameBreaker' );

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']);