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

HOR-3543

Browse Source 
update

update
This commit is contained in:
hjonathan
2017-09-21 13:57:11 -04:00
parent 7964a5030e
commit ab672f93fb
2 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/menus/caseOptions.php
View File

@@ -25,6 +25,8 @@
global $G_TMP_MENU;
global $sStatus;
global $RBAC;
$viewSteps = true;
$statusSendAndUnassigned = false;
//caseOptions
@@ -40,12 +42,9 @@ switch ($_SESSION['actionCaseOptions']) {
$statusSendAndUnassigned = true;
break;
case 'paused':
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
}
$viewSteps = false;
break;
case 'to_revise':
case 'to_reassign':
$access = $RBAC->requirePermissions('PM_REASSIGNCASE', 'PM_SUPERVISOR');
if ($access) {
if (isset($_SESSION['bNoShowSteps'])) {
@@ -53,8 +52,21 @@ switch ($_SESSION['actionCaseOptions']) {
}
}
break;
case 'to_reassign':
$access = $RBAC->requirePermissions('PM_REASSIGNCASE', 'PM_SUPERVISOR');
if ($access) {
$aData = AppDelegation::getCurrentUsers($_SESSION['APPLICATION'], $_SESSION['INDEX']);
if (isset($aData) && !in_array($_SESSION['USER_LOGGED'], $aData)) {
$viewSteps = false;
}
}
break;
default:
$aData = AppDelegation::getCurrentUsers($_SESSION['APPLICATION'], $_SESSION['INDEX']);
unset($_SESSION['bNoShowSteps']);
if (isset($aData) && !in_array($_SESSION['USER_LOGGED'], $aData)) {
$viewSteps = false;
}
break;
}
@@ -64,7 +76,9 @@ if ((($sStatus === 'DRAFT') || ($sStatus === 'TO_DO')) && !$statusSendAndUnassig
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
} else {
if ($viewSteps === true) {
$G_TMP_MENU->AddIdOption('STEPS', G::LoadTranslation('ID_STEPS'), 'javascript:showSteps();', 'absolute');
}
$G_TMP_MENU->AddIdOption('INFO', G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute');
}
$G_TMP_MENU->AddIdOption('ACTIONS', G::LoadTranslation('ID_ACTIONS'), 'javascript:showActions();', 'absolute');

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

@@ -141,7 +141,7 @@ $oHeadPublisher->assign( '_PRO_UID', $case['PRO_UID']);
$oHeadPublisher->assign('_APP_UID', $appUid);
$oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d')));
$oHeadPublisher->assign('_ENV_CURRENT_DATE_NO_FORMAT', date('Y-m-d-h-i-A'));
$oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() );
$oHeadPublisher->assign('idfirstform', is_null($oStep) ? '-1' : $oStep->getStepUidObj());
$oHeadPublisher->assign('appStatus', $case['APP_STATUS']);
$oHeadPublisher->assign('tbarGmail', $tBarGmail);