From bb6c3c78b98a77b0607d2abe216894ce6ee7894b Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Thu, 10 Nov 2011 10:31:24 -0400 Subject: [PATCH] BUG 7446 was added all options on the menu after 'Jump to' action --- workflow/engine/methods/cases/ajaxListener.php | 13 +++++++------ workflow/engine/methods/cases/open.php | 18 +++++++++++++++++- workflow/engine/templates/cases/casesList.js | 4 ++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index 8d2dfe394..6f6b0621d 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -288,13 +288,14 @@ $caseStep->getStepPosition()); $options[] = Array('text'=>G::LoadTranslation('ID_CANCEL'), 'fn'=>'cancelCase'); else $options[] = Array('text'=>G::LoadTranslation('ID_CANCEL'), 'fn'=>'cancelCase', 'hide'=>'hiden'); - } - } else { - $options[] = Array('text'=>G::LoadTranslation('ID_UNPAUSE'), 'fn'=>'unpauseCase'); - } - if($RBAC->userCanAccess('PM_REASSIGNCASE')==1) { - $options[] = Array('text'=>G::LoadTranslation('ID_REASSIGN'), 'fn'=>'getUsersToReassign'); } + } + else { + $options[] = Array('text'=>G::LoadTranslation('ID_UNPAUSE'), 'fn'=>'unpauseCase'); + } + if($RBAC->userCanAccess('PM_REASSIGNCASE')==1) { + $options[] = Array('text'=>G::LoadTranslation('ID_REASSIGN'), 'fn'=>'getUsersToReassign'); + } break; case 'CANCELLED': diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index a08b34860..851317abc 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -29,8 +29,24 @@ */ if (!isset($_GET['APP_UID']) || !isset($_GET['DEL_INDEX'])) { - throw new Exception("Application ID or Delegation Index is missing!. The System can't open the case."); + if (isset($_GET['APP_NUMBER'])) { + G::LoadClass('case'); + $oCase = new Cases(); + $_GET['APP_UID'] = $oCase->getApplicationUIDByNumber($_GET['APP_NUMBER']); + $_GET['DEL_INDEX'] = $oCase->getCurrentDelegation($_GET['APP_UID'], $_SESSION['USER_LOGGED']); + if( is_null($_GET['APP_UID']) ) { + throw new Exception(G::LoadTranslation('ID_CASE_DOES_NOT_EXISTS')); + } + if( is_null($_GET['DEL_INDEX']) ) { + throw new Exception(G::LoadTranslation('ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER')); + } + } + else { + throw new Exception("Application ID or Delegation Index is missing!. The System can't open the case."); + } } + + require_once ("classes/model/Step.php"); G::LoadClass("configuration"); G::LoadClass("case"); diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 6c4881ebd..405da1936 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -101,9 +101,9 @@ function openCase(){ } function jumpToCase(appNumber){ - params = 'APP_NUMBER=' + appNumber; + params = 'APP_NUMBER=' + appNumber; params += '&action=jump'; - requestFile = '../cases/cases_Open'; + requestFile = '../cases/open'; redirect(requestFile + '?' + params); }