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

Merged in dheeyi/processmaker/HOR-265 (pull request #3803)

Browse Source 
HOR-265
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-08 17:48:09 -04:00
parent 9033869e6c 8abe96fd9f
commit c20c4039d8
2 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,26 +24,59 @@
*/ */
global $G_TMP_MENU; global $G_TMP_MENU;
global $sStatus; global $sStatus;
global $RBAC;
$statusSendAndUnassigned = false;
if ((($sStatus == 'DRAFT') || ($sStatus == 'TO_DO')) && ($_SESSION['TASK'] != -1)) { //caseOptions
if (isset($_SESSION['bNoShowSteps'])) { switch ($_SESSION['actionCaseOptions']) {
unset($_SESSION['bNoShowSteps']); case 'todo':
} else { case 'draft':
$G_TMP_MENU->AddIdOption('STEPS' , G::LoadTranslation('ID_STEPS') , 'javascript:showSteps();' , 'absolute'); if (isset($_SESSION['bNoShowSteps'])) {
$G_TMP_MENU->AddIdOption('INFO' , G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute'); unset($_SESSION['bNoShowSteps']);
} }
$G_TMP_MENU->AddIdOption('ACTIONS' , G::LoadTranslation('ID_ACTIONS') , 'javascript:showActions();' , 'absolute'); break;
} else { case 'sent':
$G_TMP_MENU->AddIdOption('INFO' , G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute'); case 'unassigned':
$_SESSION['TASK'] = -1;
$statusSendAndUnassigned = true;
break;
case 'paused':
$access = $RBAC->requirePermissions('PM_ALLCASES');
if ($access) {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
}
} else {
$_SESSION['TASK'] = -1;
}
break;
case 'to_revise':
case 'to_reassign':
$access = $RBAC->requirePermissions('PM_REASSIGNCASE', 'PM_SUPERVISOR');
if ($access) {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
}
} else {
$_SESSION['TASK'] = -1;
}
break;
default:
unset($_SESSION['bNoShowSteps']);
break;
} }
$G_TMP_MENU->AddIdOption('NOTES' , G::LoadTranslation('ID_NOTES'), 'javascript:showNotes();', 'absolute');
unset($_SESSION['actionCaseOptions']);
if ((($sStatus === 'DRAFT') || ($sStatus === 'TO_DO')) && !$statusSendAndUnassigned) {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
} else {
$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');
} else {
$G_TMP_MENU->AddIdOption('INFO', G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute');
}
$G_TMP_MENU->AddIdOption('NOTES', G::LoadTranslation('ID_NOTES'), 'javascript:showNotes();', 'absolute');

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

@@ -132,12 +132,7 @@ if(!isset($_SESSION['APPLICATION']) || !isset($_SESSION['TASK']) || !isset($_SES
$_SESSION['APPLICATION'] = $case['APP_UID']; $_SESSION['APPLICATION'] = $case['APP_UID'];
$_SESSION['TASK'] = $case['TAS_UID']; $_SESSION['TASK'] = $case['TAS_UID'];
$_SESSION['INDEX'] = $case['DEL_INDEX']; $_SESSION['INDEX'] = $case['DEL_INDEX'];
}
$_SESSION['TASK'] = ($_GET['action'] == "unassigned" || $_GET['action'] == "sent" ) ? -1 : $_SESSION['TASK'];
if($_GET['action'] == "todo" || $_GET['action'] == "draft") {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
}
} }
$_SESSION['actionCaseOptions'] = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
G::RenderPage( 'publish', 'extJs' ); G::RenderPage( 'publish', 'extJs' );