From 7e193ef699a9317ea09759a872dd9f14ac5c7247 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Wed, 24 Aug 2022 03:10:12 +0000
Subject: [PATCH 1/2] * Fix bug #64973.

---
 module/action/control.php         | 2 +-
 module/action/view/trash.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index f18d8fa2c9..7b32ec3af3 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -125,7 +125,7 @@ class action extends control
         }
 
         /* Get the products name of story. */
-        if($browseType == 'story')
+        if($browseType == 'story' or 'requirement')
         {
             $this->loadModel('story');
             $storyIdList = array();
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 15e4935fd5..582c7c1cf2 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,7 +85,7 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->project->project;?></th>
           <?php endif;?>
-          <?php if($currentObjectType == 'story'):?>
+          <?php if($currentObjectType == 'story' or 'requirement'):?>
           <th class='w-250px'><?php echo $this->lang->story->product;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
@@ -152,7 +152,7 @@
             <?php endif;?>
           </td>
           <?php endif;?>
-          <?php if($currentObjectType == 'story'):?>
+          <?php if($currentObjectType == 'story' or 'requirement'):?>
           <td class="c-name flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
             <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
             <?php if($productList[$action->objectID]->productDeleted):?>

From 98ca0e913d98feef102b952e886142ec04b04065 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Wed, 24 Aug 2022 09:12:00 +0000
Subject: [PATCH 2/2] * Fix bug #26824.

---
 module/action/control.php         | 2 +-
 module/action/view/trash.html.php | 4 ++--
 module/my/model.php               | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 7b32ec3af3..4613347f2f 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -125,7 +125,7 @@ class action extends control
         }
 
         /* Get the products name of story. */
-        if($browseType == 'story' or 'requirement')
+        if(strpos(',story,requirement,', ",$browseType,") !== false)
         {
             $this->loadModel('story');
             $storyIdList = array();
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 582c7c1cf2..bbe2216478 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,7 +85,7 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->project->project;?></th>
           <?php endif;?>
-          <?php if($currentObjectType == 'story' or 'requirement'):?>
+          <?php if(strpos(',story,requirement,', ",$currentObjectType,") !== false):?>
           <th class='w-250px'><?php echo $this->lang->story->product;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
@@ -152,7 +152,7 @@
             <?php endif;?>
           </td>
           <?php endif;?>
-          <?php if($currentObjectType == 'story' or 'requirement'):?>
+          <?php if(strpos(',story,requirement,', ",$currentObjectType,") !== false):?>
           <td class="c-name flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
             <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
             <?php if($productList[$action->objectID]->productDeleted):?>
diff --git a/module/my/model.php b/module/my/model.php
index 6f359b99f1..4ff59e8679 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -504,7 +504,6 @@ class myModel extends model
     {
         $rawMethod = $this->app->rawMethod;
         $this->loadModel('execution');
-        $this->app->loadConfig('execution');
 
         $this->config->execution->search['module']    = $rawMethod . 'Task';
         $this->config->execution->search['actionURL'] = $actionURL;