From d66a2a679cce751663e7a4cbded9c410853b096a Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Fri, 9 Nov 2012 15:25:21 -0400 Subject: [PATCH] BUG 9943 Advanced Search menu should be seen on UXS IMPROVEMENT - According to the specifications. - Was add the file for advanced search with the same functionality. --- workflow/engine/classes/class.spool.php | 1 + workflow/engine/controllers/appProxy.php | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php index c5c75c726..6c47a4cd3 100755 --- a/workflow/engine/classes/class.spool.php +++ b/workflow/engine/classes/class.spool.php @@ -138,6 +138,7 @@ class spoolRun */ public function create ($aData) { + $aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1; $sUID = $this->db_insert( $aData ); $aData['app_msg_date'] = isset( $aData['app_msg_date'] ) ? $aData['app_msg_date'] : ''; diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index a68a97955..edbb94e3a 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -32,10 +32,17 @@ class AppProxy extends HttpProxyController } G::LoadClass( 'case' ); - $case = new Cases(); + $case = new Cases(); + $caseLoad = ''; + + if ((!isset($_SESSION['PROCESS']) || !isset($_SESSION['TASK'])) && (!isset($httpData->pro) || !isset($httpData->tas))) { + $caseLoad = $case->loadCase($appUid); + $httpData->pro = $caseLoad['APP_DATA']['PROCESS']; + $httpData->tas = $caseLoad['APP_DATA']['TASK']; + } - $proUid = ($httpData->pro == '') ? $_SESSION['PROCESS'] : $httpData->pro; - $tasUid = ($httpData->tas == '') ? $_SESSION['TASK'] : $httpData->tas; + $proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro; + $tasUid = (!isset($httpData->tas)) ? $_SESSION['TASK'] : $httpData->tas; $usrUid = $_SESSION['USER_LOGGED']; $respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );