From 5500e2fb58fdb05eac419cff36a6bba861dda868 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 9 Jun 2022 08:54:56 +0000
Subject: [PATCH 1/2] * Fix bug for task #56458.

---
 module/my/control.php        | 4 ++++
 module/my/view/bug.html.php  | 1 +
 module/my/view/task.html.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/module/my/control.php b/module/my/control.php
index 5c4b1c29fa..a0bb65e56c 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -417,6 +417,8 @@ EOF;
         $this->loadModel('execution');
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
 
+        if($type != 'bySearch') $this->session->set('myTaskType', $type);
+
         /* Save session. */
         if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
@@ -523,6 +525,8 @@ EOF;
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
         if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
+        if($type != 'bySearch') $this->session->set('myBugType', $type);
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index edff420e76..f5c3915818 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -52,6 +52,7 @@
     ?>
     <table class="table has-sort-head table-fixed" id='bugList'>
       <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+      <?php $type = $type == 'bySearch' ? $this->session->myBugType : $type;?>
       <thead>
         <tr>
           <th class="c-id">
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 0d3eb6ea33..742fcd78dd 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -50,6 +50,7 @@
     <div class="table-responsive">
       <table class="table has-sort-head table-fixed" id='taskTable'>
         <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+        <?php $type = $type == 'bySearch' ? $this->session->myTaskType : $type;?>
         <thead>
           <tr>
             <th class="c-id">

From 367ed5c19036b1f12376c0eadcdb56070a7f4f04 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 9 Jun 2022 08:59:56 +0000
Subject: [PATCH 2/2] * Adjust code.

---
 module/my/control.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index a0bb65e56c..694bbe83a5 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -417,9 +417,9 @@ EOF;
         $this->loadModel('execution');
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
 
-        if($type != 'bySearch') $this->session->set('myTaskType', $type);
 
         /* Save session. */
+        if($type != 'bySearch')            $this->session->set('myTaskType', $type);
         if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
         /* Load pager. */
@@ -523,9 +523,9 @@ EOF;
         $this->loadModel('bug');
         $this->app->loadLang('bug');
         $queryID  = ($type == 'bySearch') ? (int)$param : 0;
+        if($type != 'bySearch')            $this->session->set('myBugType', $type);
         if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
-        if($type != 'bySearch') $this->session->set('myBugType', $type);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);