From d66a2a679cce751663e7a4cbded9c410853b096a Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Fri, 9 Nov 2012 15:25:21 -0400
Subject: [PATCH 1/3] 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' );

From a51441be4269bb6ab21ee63858a5ca6029698052 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Fri, 9 Nov 2012 15:51:18 -0400
Subject: [PATCH 2/3] 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/controllers/appProxy.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php
index edbb94e3a..0277a835e 100644
--- a/workflow/engine/controllers/appProxy.php
+++ b/workflow/engine/controllers/appProxy.php
@@ -37,12 +37,11 @@ class AppProxy extends HttpProxyController
 
         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'];
+            $httpData->pro = $caseLoad['PRO_UID'];
         }
 
         $proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro;
-        $tasUid = (!isset($httpData->tas)) ? $_SESSION['TASK'] : $httpData->tas;
+        $tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas;
         $usrUid = $_SESSION['USER_LOGGED'];
 
         $respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );

From 58dab395d1ee05d533f2796e5a274594c4e2dc57 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Fri, 9 Nov 2012 15:55:05 -0400
Subject: [PATCH 3/3] 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/controllers/appProxy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php
index 0277a835e..d0e99ea90 100644
--- a/workflow/engine/controllers/appProxy.php
+++ b/workflow/engine/controllers/appProxy.php
@@ -35,7 +35,7 @@ class AppProxy extends HttpProxyController
         $case = new Cases();
         $caseLoad = '';
 
-        if ((!isset($_SESSION['PROCESS']) || !isset($_SESSION['TASK'])) && (!isset($httpData->pro) || !isset($httpData->tas))) {
+        if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) {
             $caseLoad = $case->loadCase($appUid);
             $httpData->pro = $caseLoad['PRO_UID'];
         }