From bacc10ccc0a408f8c336939eb32ad6d5bd4b3e89 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Thu, 18 Aug 2022 06:41:41 +0000
Subject: [PATCH 01/18] * Finish task #64969.

---
 framework/base/helper.class.php   |  4 ++--
 lib/dao/dao.class.php             | 12 ++++++------
 module/action/control.php         | 12 +++++++++++-
 module/action/view/trash.html.php |  9 +++++++++
 module/project/model.php          |  9 +++++++++
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index c787cc08fe..8c98c97628 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -885,8 +885,8 @@ function getWebRoot($full = false)
  *
  * @param  array|object    $var
  * @param  string|int      $key
- * @param  mixed           $valueWhenNone     value when the key not exits.
- * @param  mixed           $valueWhenExists   value when the key exits.
+ * @param  mixed           $valueWhenNone     value when the key not exists.
+ * @param  mixed           $valueWhenExists   value when the key exists.
  * @access public
  * @return mixed
  */
diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index 0695c65d0d..f3d50e89e6 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -29,7 +29,7 @@ class dao extends baseDAO
     /**
      * 设置需要更新或插入的数据。
      * Set the data to update or insert.
-     * 
+     *
      * @param  object $data  the data object or array
      * @access public
      * @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
 
     /**
      * Check workFlow field rule.
-     * 
+     *
      * @access public
      * @return object the dao object self.
      */
@@ -232,10 +232,10 @@ class dao extends baseDAO
     }
 
     /**
-     * 检查工作流扩展字段 
-     * check workflow extend field 
-     * 
-     * @param  array $fields 
+     * 检查工作流扩展字段
+     * check workflow extend field
+     *
+     * @param  array $fields
      * @access public
      * @return object the dao object self
      */
diff --git a/module/action/control.php b/module/action/control.php
index 6edd4aed0d..b4c280f25d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -52,6 +52,8 @@ class action extends control
     public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('backup');
+        $this->app->loadLang('execution');
+        $this->app->loadLang('project');
 
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -115,6 +117,15 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
+        /* Get the project name of executions. */
+        if($browseType == 'execution')
+        {
+            $executionIdList = array();
+            foreach($trashes as $trash) $executionIdList[] = $trash->objectID;
+            $projectPairs = $this->loadModel('project')->getProjectName($executionIdList);
+            $this->view->projectPairs = $projectPairs;
+        }
+
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -130,7 +141,6 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
-
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 03352675bb..efeaae5ae7 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,6 +82,7 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
+          <th class='w-250px'><?php if($currentObjectType == 'execution') echo $this->lang->execution->project;?></th>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -135,6 +136,14 @@
             }
             ?>
           </td>
+          <td>
+            <?php if($currentObjectType == 'execution'):?>
+            <span title='<?php echo $projectPairs[$action->project]->name;?>'><?php echo $projectPairs[$action->project]->name;?></span>
+            <?php if($projectPairs[$action->project]->deleted):?>
+            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+            <?php endif; ?>
+            <?php endif; ?>
+          </td>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index 1bd12fd0cb..aacba0b298 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2613,5 +2613,14 @@ class projectModel extends model
         }
 
         return $menu;
+
     }
+    public function getProjectName($executionIdList)
+    {
+        return $this->dao->select('t1.id, t2.id as projectID, t2.name, t2.deleted')->from(TABLE_EXECUTION)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->where('t1.id')->in($executionIdList)
+            ->fetchAll('projectID');
+    }
+
 }

From a68ba64ad8d549effa29a1b8dbb83d9029d461e7 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 04:50:57 +0000
Subject: [PATCH 02/18] Revert "* Finish task #64969."

This reverts commit bacc10ccc0a408f8c336939eb32ad6d5bd4b3e89.
---
 framework/base/helper.class.php   |  4 ++--
 lib/dao/dao.class.php             | 12 ++++++------
 module/action/control.php         | 12 +-----------
 module/action/view/trash.html.php |  9 ---------
 module/project/model.php          |  9 ---------
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 8c98c97628..c787cc08fe 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -885,8 +885,8 @@ function getWebRoot($full = false)
  *
  * @param  array|object    $var
  * @param  string|int      $key
- * @param  mixed           $valueWhenNone     value when the key not exists.
- * @param  mixed           $valueWhenExists   value when the key exists.
+ * @param  mixed           $valueWhenNone     value when the key not exits.
+ * @param  mixed           $valueWhenExists   value when the key exits.
  * @access public
  * @return mixed
  */
diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index f3d50e89e6..0695c65d0d 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -29,7 +29,7 @@ class dao extends baseDAO
     /**
      * 设置需要更新或插入的数据。
      * Set the data to update or insert.
-     *
+     * 
      * @param  object $data  the data object or array
      * @access public
      * @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
 
     /**
      * Check workFlow field rule.
-     *
+     * 
      * @access public
      * @return object the dao object self.
      */
@@ -232,10 +232,10 @@ class dao extends baseDAO
     }
 
     /**
-     * 检查工作流扩展字段
-     * check workflow extend field
-     *
-     * @param  array $fields
+     * 检查工作流扩展字段 
+     * check workflow extend field 
+     * 
+     * @param  array $fields 
      * @access public
      * @return object the dao object self
      */
diff --git a/module/action/control.php b/module/action/control.php
index b4c280f25d..6edd4aed0d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -52,8 +52,6 @@ class action extends control
     public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('backup');
-        $this->app->loadLang('execution');
-        $this->app->loadLang('project');
 
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -117,15 +115,6 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-        /* Get the project name of executions. */
-        if($browseType == 'execution')
-        {
-            $executionIdList = array();
-            foreach($trashes as $trash) $executionIdList[] = $trash->objectID;
-            $projectPairs = $this->loadModel('project')->getProjectName($executionIdList);
-            $this->view->projectPairs = $projectPairs;
-        }
-
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -141,6 +130,7 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
+
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index efeaae5ae7..03352675bb 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,7 +82,6 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-          <th class='w-250px'><?php if($currentObjectType == 'execution') echo $this->lang->execution->project;?></th>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -136,14 +135,6 @@
             }
             ?>
           </td>
-          <td>
-            <?php if($currentObjectType == 'execution'):?>
-            <span title='<?php echo $projectPairs[$action->project]->name;?>'><?php echo $projectPairs[$action->project]->name;?></span>
-            <?php if($projectPairs[$action->project]->deleted):?>
-            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
-            <?php endif; ?>
-            <?php endif; ?>
-          </td>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index aacba0b298..1bd12fd0cb 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2613,14 +2613,5 @@ class projectModel extends model
         }
 
         return $menu;
-
     }
-    public function getProjectName($executionIdList)
-    {
-        return $this->dao->select('t1.id, t2.id as projectID, t2.name, t2.deleted')->from(TABLE_EXECUTION)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.id')->in($executionIdList)
-            ->fetchAll('projectID');
-    }
-
 }

From 730c63859893f773f598f4b484b2c349bebd23cd Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 04:57:54 +0000
Subject: [PATCH 03/18] * Finish task #64969.

---
 module/action/control.php         | 13 +++++++++++++
 module/action/css/trash.css       |  3 +++
 module/action/view/trash.html.php | 17 +++++++++++++++++
 module/project/model.php          |  7 ++++---
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 6edd4aed0d..dcfa277933 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,6 +115,19 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
+<<<<<<< Updated upstream
+=======
+        /* Get the project name of executions. */
+        if($browseType == 'execution')
+        {
+            $this->app->loadLang('execution');
+            $projectIdList = array();
+            foreach($trashes as $trash) $projectIdList[] = $trash->project;
+            $projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
+            $this->view->projectList = $projectList;
+        }
+
+>>>>>>> Stashed changes
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index e5b7a61042..94cf000e62 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -6,3 +6,6 @@
 
 .dropdown-menu .btn-active-text:hover .text:after {border-bottom: 0px;}
 #querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
+td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
+.flex span.label-danger {margin-left: 5px; min-width: 50px;}
+.c-name > .text-ellipsis {text-overflow: clip;}
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 03352675bb..e2c235b94d 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,6 +82,12 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
+<<<<<<< Updated upstream
+=======
+          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
+          <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
+          <?php endif;?>
+>>>>>>> Stashed changes
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -135,6 +141,17 @@
             }
             ?>
           </td>
+<<<<<<< Updated upstream
+=======
+          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
+          <td class="flex" title="<?php echo $projectList[$action->project]->name;?>">
+            <span class="text-ellipsis"><?php echo $projectList[$action->project]->name;?></span>
+            <?php if($projectList[$action->project]->deleted):?>
+            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+            <?php endif;?>
+          </td>
+          <?php endif;?>
+>>>>>>> Stashed changes
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index 1bd12fd0cb..b85b11c5de 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -797,16 +797,17 @@ class projectModel extends model
     /**
      * Get project by id list.
      *
-     * @param  array    $projectIdList
+     * @param  array  $projectIdList
+     * @param  string $mode all
      * @access public
      * @return object
      */
-    public function getByIdList($projectIdList = array())
+    public function getByIdList($projectIdList = array(), $mode = '')
     {
         return $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
             ->andWhere('id')->in($projectIdList)
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->fetchAll('id');
     }
 

From 93adfc3971a311e4c49b307d0f290e0df51da906 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Thu, 18 Aug 2022 06:41:41 +0000
Subject: [PATCH 04/18] * Finish task #64969.

---
 framework/base/helper.class.php   |  4 ++--
 module/action/control.php         | 12 +++++++++++-
 module/action/view/trash.html.php |  9 +++++++++
 module/project/model.php          |  9 +++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index b39d02977d..72649210d5 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -890,8 +890,8 @@ function getWebRoot($full = false)
  *
  * @param  array|object    $var
  * @param  string|int      $key
- * @param  mixed           $valueWhenNone     value when the key not exits.
- * @param  mixed           $valueWhenExists   value when the key exits.
+ * @param  mixed           $valueWhenNone     value when the key not exists.
+ * @param  mixed           $valueWhenExists   value when the key exists.
  * @access public
  * @return mixed
  */
diff --git a/module/action/control.php b/module/action/control.php
index 6edd4aed0d..b4c280f25d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -52,6 +52,8 @@ class action extends control
     public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('backup');
+        $this->app->loadLang('execution');
+        $this->app->loadLang('project');
 
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -115,6 +117,15 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
+        /* Get the project name of executions. */
+        if($browseType == 'execution')
+        {
+            $executionIdList = array();
+            foreach($trashes as $trash) $executionIdList[] = $trash->objectID;
+            $projectPairs = $this->loadModel('project')->getProjectName($executionIdList);
+            $this->view->projectPairs = $projectPairs;
+        }
+
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -130,7 +141,6 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
-
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 03352675bb..efeaae5ae7 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,6 +82,7 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
+          <th class='w-250px'><?php if($currentObjectType == 'execution') echo $this->lang->execution->project;?></th>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -135,6 +136,14 @@
             }
             ?>
           </td>
+          <td>
+            <?php if($currentObjectType == 'execution'):?>
+            <span title='<?php echo $projectPairs[$action->project]->name;?>'><?php echo $projectPairs[$action->project]->name;?></span>
+            <?php if($projectPairs[$action->project]->deleted):?>
+            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+            <?php endif; ?>
+            <?php endif; ?>
+          </td>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index 1bd12fd0cb..aacba0b298 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2613,5 +2613,14 @@ class projectModel extends model
         }
 
         return $menu;
+
     }
+    public function getProjectName($executionIdList)
+    {
+        return $this->dao->select('t1.id, t2.id as projectID, t2.name, t2.deleted')->from(TABLE_EXECUTION)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->where('t1.id')->in($executionIdList)
+            ->fetchAll('projectID');
+    }
+
 }

From 9fa036cb3429680b067d8d52979a1abfe361d4fc Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 04:50:57 +0000
Subject: [PATCH 05/18] Revert "* Finish task #64969."

This reverts commit bacc10ccc0a408f8c336939eb32ad6d5bd4b3e89.
---
 framework/base/helper.class.php   |  4 ++--
 lib/dao/dao.class.php             | 12 ++++++------
 module/action/control.php         | 12 +-----------
 module/action/view/trash.html.php |  9 ---------
 module/project/model.php          |  9 ---------
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 72649210d5..b39d02977d 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -890,8 +890,8 @@ function getWebRoot($full = false)
  *
  * @param  array|object    $var
  * @param  string|int      $key
- * @param  mixed           $valueWhenNone     value when the key not exists.
- * @param  mixed           $valueWhenExists   value when the key exists.
+ * @param  mixed           $valueWhenNone     value when the key not exits.
+ * @param  mixed           $valueWhenExists   value when the key exits.
  * @access public
  * @return mixed
  */
diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index e18d52847f..c6326f5a46 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -29,7 +29,7 @@ class dao extends baseDAO
     /**
      * 设置需要更新或插入的数据。
      * Set the data to update or insert.
-     *
+     * 
      * @param  object $data  the data object or array
      * @access public
      * @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
 
     /**
      * Check workFlow field rule.
-     *
+     * 
      * @access public
      * @return object the dao object self.
      */
@@ -232,10 +232,10 @@ class dao extends baseDAO
     }
 
     /**
-     * 检查工作流扩展字段
-     * check workflow extend field
-     *
-     * @param  array $fields
+     * 检查工作流扩展字段 
+     * check workflow extend field 
+     * 
+     * @param  array $fields 
      * @access public
      * @return object the dao object self
      */
diff --git a/module/action/control.php b/module/action/control.php
index b4c280f25d..6edd4aed0d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -52,8 +52,6 @@ class action extends control
     public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('backup');
-        $this->app->loadLang('execution');
-        $this->app->loadLang('project');
 
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -117,15 +115,6 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-        /* Get the project name of executions. */
-        if($browseType == 'execution')
-        {
-            $executionIdList = array();
-            foreach($trashes as $trash) $executionIdList[] = $trash->objectID;
-            $projectPairs = $this->loadModel('project')->getProjectName($executionIdList);
-            $this->view->projectPairs = $projectPairs;
-        }
-
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -141,6 +130,7 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
+
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index efeaae5ae7..03352675bb 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,7 +82,6 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-          <th class='w-250px'><?php if($currentObjectType == 'execution') echo $this->lang->execution->project;?></th>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -136,14 +135,6 @@
             }
             ?>
           </td>
-          <td>
-            <?php if($currentObjectType == 'execution'):?>
-            <span title='<?php echo $projectPairs[$action->project]->name;?>'><?php echo $projectPairs[$action->project]->name;?></span>
-            <?php if($projectPairs[$action->project]->deleted):?>
-            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
-            <?php endif; ?>
-            <?php endif; ?>
-          </td>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index aacba0b298..1bd12fd0cb 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2613,14 +2613,5 @@ class projectModel extends model
         }
 
         return $menu;
-
     }
-    public function getProjectName($executionIdList)
-    {
-        return $this->dao->select('t1.id, t2.id as projectID, t2.name, t2.deleted')->from(TABLE_EXECUTION)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.id')->in($executionIdList)
-            ->fetchAll('projectID');
-    }
-
 }

From e3800e4e49854fb44b16c8d9239f49d90167156d Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 04:57:54 +0000
Subject: [PATCH 06/18] * Finish task #64969.

---
 module/action/control.php         | 13 +++++++++++++
 module/action/css/trash.css       |  3 +++
 module/action/view/trash.html.php | 17 +++++++++++++++++
 module/project/model.php          |  7 ++++---
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 6edd4aed0d..dcfa277933 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,6 +115,19 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
+<<<<<<< Updated upstream
+=======
+        /* Get the project name of executions. */
+        if($browseType == 'execution')
+        {
+            $this->app->loadLang('execution');
+            $projectIdList = array();
+            foreach($trashes as $trash) $projectIdList[] = $trash->project;
+            $projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
+            $this->view->projectList = $projectList;
+        }
+
+>>>>>>> Stashed changes
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index e5b7a61042..94cf000e62 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -6,3 +6,6 @@
 
 .dropdown-menu .btn-active-text:hover .text:after {border-bottom: 0px;}
 #querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
+td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
+.flex span.label-danger {margin-left: 5px; min-width: 50px;}
+.c-name > .text-ellipsis {text-overflow: clip;}
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 03352675bb..e2c235b94d 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,6 +82,12 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
+<<<<<<< Updated upstream
+=======
+          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
+          <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
+          <?php endif;?>
+>>>>>>> Stashed changes
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -135,6 +141,17 @@
             }
             ?>
           </td>
+<<<<<<< Updated upstream
+=======
+          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
+          <td class="flex" title="<?php echo $projectList[$action->project]->name;?>">
+            <span class="text-ellipsis"><?php echo $projectList[$action->project]->name;?></span>
+            <?php if($projectList[$action->project]->deleted):?>
+            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+            <?php endif;?>
+          </td>
+          <?php endif;?>
+>>>>>>> Stashed changes
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/project/model.php b/module/project/model.php
index 1bd12fd0cb..b85b11c5de 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -797,16 +797,17 @@ class projectModel extends model
     /**
      * Get project by id list.
      *
-     * @param  array    $projectIdList
+     * @param  array  $projectIdList
+     * @param  string $mode all
      * @access public
      * @return object
      */
-    public function getByIdList($projectIdList = array())
+    public function getByIdList($projectIdList = array(), $mode = '')
     {
         return $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
             ->andWhere('id')->in($projectIdList)
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->fetchAll('id');
     }
 

From 71c48926fdee60c36ac74fe38035d3fc2353f469 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 05:18:52 +0000
Subject: [PATCH 07/18] * Finish task #64969.

---
 module/action/control.php         | 4 ----
 module/action/view/trash.html.php | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index dcfa277933..c7926adfc5 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,8 +115,6 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-<<<<<<< Updated upstream
-=======
         /* Get the project name of executions. */
         if($browseType == 'execution')
         {
@@ -127,7 +125,6 @@ class action extends control
             $this->view->projectList = $projectList;
         }
 
->>>>>>> Stashed changes
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -143,7 +140,6 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
-
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index e2c235b94d..33062b95bf 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -82,12 +82,9 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-<<<<<<< Updated upstream
-=======
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
->>>>>>> Stashed changes
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -141,8 +138,6 @@
             }
             ?>
           </td>
-<<<<<<< Updated upstream
-=======
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <td class="flex" title="<?php echo $projectList[$action->project]->name;?>">
             <span class="text-ellipsis"><?php echo $projectList[$action->project]->name;?></span>
@@ -151,7 +146,6 @@
             <?php endif;?>
           </td>
           <?php endif;?>
->>>>>>> Stashed changes
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>

From 475cb7bf60a504181ef1c0f93d285a229df90a17 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 07:13:21 +0000
Subject: [PATCH 08/18] Remove the unused code.

---
 module/action/control.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 48253b46d5..c7926adfc5 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,11 +115,6 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-<<<<<<< HEAD
-=======
-<<<<<<< Updated upstream
-=======
->>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
         /* Get the project name of executions. */
         if($browseType == 'execution')
         {
@@ -130,10 +125,6 @@ class action extends control
             $this->view->projectList = $projectList;
         }
 
-<<<<<<< HEAD
-=======
->>>>>>> Stashed changes
->>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;

From 27881df4317a28404a624f83eb14cbc623681d3b Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 07:23:57 +0000
Subject: [PATCH 09/18] * Finish #task64969.

---
 module/action/view/trash.html.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 6be172e54d..153abeda21 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,9 +85,7 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
-          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
-          <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
-          <?php endif;?> <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th> <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th> <th class='c-actions'><?php echo $lang->actions;?></th> </tr> </thead> <tbody> <?php foreach($trashes as $action):?> <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?> <tr> <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td> <td><?php echo $action->objectID;?></td> <td class='text-left'> <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th> <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th> <th class='c-actions'><?php echo $lang->actions;?></th> </tr> </thead> <tbody> <?php foreach($trashes as $action):?> <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?> <tr> <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td> <td><?php echo $action->objectID;?></td> <td class='text-left'> <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
             $methodName = 'view';
             if($module == 'caselib')
             {

From 08f38590e10a746e7fffa4025af0e85912eb1bfc Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 07:45:42 +0000
Subject: [PATCH 10/18] * Finish task #64969.

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

diff --git a/module/action/control.php b/module/action/control.php
index c7926adfc5..29eaf6eeb3 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -121,8 +121,7 @@ class action extends control
             $this->app->loadLang('execution');
             $projectIdList = array();
             foreach($trashes as $trash) $projectIdList[] = $trash->project;
-            $projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
-            $this->view->projectList = $projectList;
+            $this->view->projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
         }
 
         /* Title and position. */
@@ -140,6 +139,7 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
+
         $this->display();
     }
 
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 153abeda21..1f0e6dd1d5 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,9 +85,21 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
-           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th> <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th> <th class='c-actions'><?php echo $lang->actions;?></th> </tr> </thead> <tbody> <?php foreach($trashes as $action):?> <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?> <tr> <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td> <td><?php echo $action->objectID;?></td> <td class='text-left'> <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
-            $methodName = 'view';
-            if($module == 'caselib')
+          <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
+          <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
+          <th class='c-actions'><?php echo $lang->actions;?></th>
+        </tr>
+       </thead>
+       <tbody>
+         <?php foreach($trashes as $action):?>
+         <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
+         <tr>
+           <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
+           <td><?php echo $action->objectID;?></td>
+           <td class='text-left'>
+             <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+             $methodName = 'view';
+             if($module == 'caselib')
             {
                 $methodName = 'view';
                 $module     = 'caselib';

From b0be7fe54b14c5e26bc87e186bd9c52cd65e89ee Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 07:50:31 +0000
Subject: [PATCH 11/18] * Finish task #64969.

---
 module/action/view/trash.html.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 1f0e6dd1d5..d84acf0a2f 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -89,17 +89,17 @@
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
         </tr>
-       </thead>
-       <tbody>
-         <?php foreach($trashes as $action):?>
-         <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-         <tr>
-           <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
-           <td><?php echo $action->objectID;?></td>
-           <td class='text-left'>
-             <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
-             $methodName = 'view';
-             if($module == 'caselib')
+      </thead>
+      <tbody>
+        <?php foreach($trashes as $action):?>
+        <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
+        <tr>
+          <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
+          <td><?php echo $action->objectID;?></td>
+          <td class='text-left'>
+            <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+            $methodName = 'view';
+            if($module == 'caselib')
             {
                 $methodName = 'view';
                 $module     = 'caselib';

From 6df526827c1049c9a8788bacdb7dae8705c001d8 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Fri, 19 Aug 2022 07:53:49 +0000
Subject: [PATCH 12/18] * Finish task #64969.

---
 module/action/view/trash.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index d84acf0a2f..33062b95bf 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -97,7 +97,8 @@
           <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
           <td><?php echo $action->objectID;?></td>
           <td class='text-left'>
-            <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+            <?php
+            $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
             $methodName = 'view';
             if($module == 'caselib')
             {

From cedf77727b1267b0d97000ab9fdc3efdeb548451 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Mon, 22 Aug 2022 13:03:04 +0000
Subject: [PATCH 13/18] * Finish task #64972,64973.

---
 module/action/control.php         | 20 +++++++++++++++++++-
 module/action/view/trash.html.php | 22 ++++++++++++++++++++++
 module/execution/model.php        |  2 +-
 module/story/model.php            |  3 +--
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 29eaf6eeb3..e2eba9357b 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,7 +115,7 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-        /* Get the project name of executions. */
+        /* Get the projects name of executions. */
         if($browseType == 'execution')
         {
             $this->app->loadLang('execution');
@@ -124,6 +124,24 @@ class action extends control
             $this->view->projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
         }
 
+        /* Get the products name of story. */
+        if($browseType == 'story')
+        {
+            $this->app->loadLang('project');
+            $storyIdList = array();
+            foreach($trashes as $trash) $storyIdList[] = $trash->objectID;
+            $this->view->productList = $this->loadModel('story')->getByList($storyIdList, 'story');
+        }
+
+        /* Get the executions name of task. */
+        if($browseType == 'task')
+        {
+            $this->app->loadLang('task');
+            $this->app->loadLang('project');
+            $executionIdList = array();
+            foreach($trashes as $trash) $executionIdList[] = $trash->execution;
+            $this->view->executionList = $this->loadModel('execution')->getByIdList($executionIdList);
+        }
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 33062b95bf..985d5dff6d 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,6 +85,12 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
+          <?php if($currentObjectType == 'story'):?>
+          <th class='w-250px'><?php echo $this->lang->project->product;?></th>
+          <?php endif;?>
+          <?php if($currentObjectType == 'task'):?>
+          <th class='w-250px'><?php echo $this->lang->task->execution;?></th>
+          <?php endif;?>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -146,6 +152,22 @@
             <?php endif;?>
           </td>
           <?php endif;?>
+          <?php if($currentObjectType == 'story'):?>
+          <td class="flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
+          <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
+          <?php if($productList[$action->objectID]->deleted):?>
+          <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+          <?php endif;?>
+          </td>
+          <?php endif;?>
+          <?php if($currentObjectType == 'task'):?>
+          <td class="flex" title="<?php echo $executionList[$action->execution]->name;?>">
+          <span class="text-ellipsis"><?php echo $executionList[$action->execution]->name;?></span>
+          <?php if($executionList[$action->execution]->deleted):?>
+          <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
+          <?php endif;?>
+          </td>
+          <?php endif;?>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>
diff --git a/module/execution/model.php b/module/execution/model.php
index 6dba35e462..b07229429f 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1308,7 +1308,7 @@ class executionModel extends model
      */
     public function getByIdList($executionIdList = array())
     {
-        return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->andWhere('deleted')->eq(0)->fetchAll('id');
+        return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
     }
 
     /**
diff --git a/module/story/model.php b/module/story/model.php
index 679afde7a9..1a41d03e6c 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -91,11 +91,10 @@ class storyModel extends model
      */
     public function getByList($storyIdList = 0, $type = 'story')
     {
-        return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle')
+        return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle, t3.deleted')
             ->from(TABLE_STORY)->alias('t1')
             ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
-            ->where('t1.deleted')->eq(0)
             ->andWhere('t1.version=t2.version')
             ->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi()
             ->beginIF(!$storyIdList)->andWhere('t1.type')->eq($type)->fi()

From 57528ecba515b0273ea9adaa578b9fdb7852c0b7 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Tue, 23 Aug 2022 06:59:18 +0000
Subject: [PATCH 14/18] * Finish task #64972,64973.

---
 module/action/control.php         | 10 ++++++----
 module/action/view/trash.html.php | 16 ++++++++--------
 module/execution/model.php        |  8 ++++++--
 module/story/model.php            |  8 +++++---
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index e2eba9357b..0baf2fcad8 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -119,28 +119,30 @@ class action extends control
         if($browseType == 'execution')
         {
             $this->app->loadLang('execution');
+            $this->loadModel('project');
             $projectIdList = array();
             foreach($trashes as $trash) $projectIdList[] = $trash->project;
-            $this->view->projectList = $this->loadModel('project')->getByIdList($projectIdList, 'all');
+            $this->view->projectList = $this->project->getByIdList($projectIdList, 'all');
         }
 
         /* Get the products name of story. */
         if($browseType == 'story')
         {
             $this->app->loadLang('project');
+            $this->loadModel('story');
             $storyIdList = array();
             foreach($trashes as $trash) $storyIdList[] = $trash->objectID;
-            $this->view->productList = $this->loadModel('story')->getByList($storyIdList, 'story');
+            $this->view->productList = $this->story->getByList($storyIdList, 'story', 'all');
         }
 
         /* Get the executions name of task. */
         if($browseType == 'task')
         {
             $this->app->loadLang('task');
-            $this->app->loadLang('project');
+            $this->loadModel('execution');
             $executionIdList = array();
             foreach($trashes as $trash) $executionIdList[] = $trash->execution;
-            $this->view->executionList = $this->loadModel('execution')->getByIdList($executionIdList);
+            $this->view->executionList = $this->execution->getByIdList($executionIdList, 'all');
         }
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 985d5dff6d..752c2d4ab7 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -154,18 +154,18 @@
           <?php endif;?>
           <?php if($currentObjectType == 'story'):?>
           <td class="flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
-          <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
-          <?php if($productList[$action->objectID]->deleted):?>
-          <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
-          <?php endif;?>
+            <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
+            <?php if($productList[$action->objectID]->productDeleted):?>
+            <span class='label label-danger'><?php echo $this->lang->story->deleted;?></span>
+            <?php endif;?>
           </td>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
           <td class="flex" title="<?php echo $executionList[$action->execution]->name;?>">
-          <span class="text-ellipsis"><?php echo $executionList[$action->execution]->name;?></span>
-          <?php if($executionList[$action->execution]->deleted):?>
-          <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
-          <?php endif;?>
+            <span class="text-ellipsis"><?php echo $executionList[$action->execution]->name;?></span>
+            <?php if($executionList[$action->execution]->deleted):?>
+            <span class='label label-danger'><?php echo $this->lang->execution->deleted;?></span>
+            <?php endif;?>
           </td>
           <?php endif;?>
           <td><?php echo zget($users, $action->actor);?></td>
diff --git a/module/execution/model.php b/module/execution/model.php
index b07229429f..62c75cb607 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1303,12 +1303,16 @@ class executionModel extends model
      * Get execution by idList.
      *
      * @param  array  $executionIdList
+     * @param  string $mode all
      * @access public
      * @return array
      */
-    public function getByIdList($executionIdList = array())
+    public function getByIdList($executionIdList = array(), $mode = '')
     {
-        return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
+        return $this->dao->select('*')->from(TABLE_EXECUTION)
+            ->where('id')->in($executionIdList)
+            ->beginIF($mode != 'all')->andWhere('deleted')->eq(0)->fi()
+            ->fetchAll('id');
     }
 
     /**
diff --git a/module/story/model.php b/module/story/model.php
index 1a41d03e6c..b709a367e4 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -86,16 +86,18 @@ class storyModel extends model
      *
      * @param  int|array|string    $storyIdList
      * @param  string $type requirement|story
+     * @param  string $mode all
      * @access public
      * @return array
      */
-    public function getByList($storyIdList = 0, $type = 'story')
+    public function getByList($storyIdList = 0, $type = 'story', $mode = '')
     {
-        return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle, t3.deleted')
+        return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle, t3.deleted as productDeleted')
             ->from(TABLE_STORY)->alias('t1')
             ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
-            ->andWhere('t1.version=t2.version')
+            ->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi()
+            ->where('t1.version=t2.version')
             ->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi()
             ->beginIF(!$storyIdList)->andWhere('t1.type')->eq($type)->fi()
             ->fetchAll('id');

From a825fa54ae893ae20c88369c42edd707a9cbdeb1 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Tue, 23 Aug 2022 07:15:16 +0000
Subject: [PATCH 15/18] * Finish task #64972,64973.

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

diff --git a/module/action/control.php b/module/action/control.php
index 0baf2fcad8..f962cdbfa1 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -128,7 +128,6 @@ class action extends control
         /* Get the products name of story. */
         if($browseType == 'story')
         {
-            $this->app->loadLang('project');
             $this->loadModel('story');
             $storyIdList = array();
             foreach($trashes as $trash) $storyIdList[] = $trash->objectID;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 752c2d4ab7..6167da3e76 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -86,7 +86,7 @@
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'story'):?>
-          <th class='w-250px'><?php echo $this->lang->project->product;?></th>
+          <th class='w-250px'><?php echo $this->lang->story->product;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
           <th class='w-250px'><?php echo $this->lang->task->execution;?></th>
diff --git a/module/story/model.php b/module/story/model.php
index b709a367e4..663540387f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -96,8 +96,8 @@ class storyModel extends model
             ->from(TABLE_STORY)->alias('t1')
             ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
-            ->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi()
             ->where('t1.version=t2.version')
+            ->beginIF($mode != 'all')->andWhere('t1.deleted')->eq(0)->fi()
             ->beginIF($storyIdList)->andWhere('t1.id')->in($storyIdList)->fi()
             ->beginIF(!$storyIdList)->andWhere('t1.type')->eq($type)->fi()
             ->fetchAll('id');

From f3b8e6337615c8433657631f2a6f6c818c84bee8 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Tue, 23 Aug 2022 10:46:03 +0000
Subject: [PATCH 16/18] * Finsh task #64972,64973,64969.

---
 module/action/control.php         | 1 -
 module/action/css/trash.css       | 4 ++++
 module/action/view/trash.html.php | 8 ++++----
 module/project/lang/de.php        | 2 +-
 module/project/lang/fr.php        | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index f962cdbfa1..f18d8fa2c9 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -118,7 +118,6 @@ class action extends control
         /* Get the projects name of executions. */
         if($browseType == 'execution')
         {
-            $this->app->loadLang('execution');
             $this->loadModel('project');
             $projectIdList = array();
             foreach($trashes as $trash) $projectIdList[] = $trash->project;
diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index 94cf000e62..08c1abed46 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -8,4 +8,8 @@
 #querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
 td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
 .flex span.label-danger {margin-left: 5px; min-width: 50px;}
+[lang^=en] .flex span.label-danger {min-width: 52px;}
+[lang^=de] .flex span.label-danger {min-width: 58px;}
+[lang^=fr] .flex span.label-danger {min-width: 69px;}
 .c-name > .text-ellipsis {text-overflow: clip;}
+
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 6167da3e76..15e4935fd5 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -83,7 +83,7 @@
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
-          <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
+          <th class='w-250px'><?php echo $this->lang->project->project;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'story'):?>
           <th class='w-250px'><?php echo $this->lang->story->product;?></th>
@@ -145,7 +145,7 @@
             ?>
           </td>
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
-          <td class="flex" title="<?php echo $projectList[$action->project]->name;?>">
+          <td class="c-name flex" title="<?php echo $projectList[$action->project]->name;?>">
             <span class="text-ellipsis"><?php echo $projectList[$action->project]->name;?></span>
             <?php if($projectList[$action->project]->deleted):?>
             <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
@@ -153,7 +153,7 @@
           </td>
           <?php endif;?>
           <?php if($currentObjectType == 'story'):?>
-          <td class="flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
+          <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):?>
             <span class='label label-danger'><?php echo $this->lang->story->deleted;?></span>
@@ -161,7 +161,7 @@
           </td>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
-          <td class="flex" title="<?php echo $executionList[$action->execution]->name;?>">
+          <td class="c-name flex" title="<?php echo $executionList[$action->execution]->name;?>">
             <span class="text-ellipsis"><?php echo $executionList[$action->execution]->name;?></span>
             <?php if($executionList[$action->execution]->deleted):?>
             <span class='label label-danger'><?php echo $this->lang->execution->deleted;?></span>
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 1c678d1312..17b7fd1bc2 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -48,7 +48,7 @@ $lang->project->errorSamePlans     = 'Project cannot be associated with multiple
 $lang->project->errorNoProducts    = 'At least one product is associated';
 $lang->project->copyNoProject      = 'There are no items available to copy.';
 $lang->project->searchByName       = 'Enter the project name to search';
-$lang->project->deleted            = 'Deleted';
+$lang->project->deleted            = 'Gelöscht';
 $lang->project->linkedProducts     = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts   = "Unlinked {$lang->productCommon}s";
 $lang->project->testreport         = 'Testreport';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 1d650086f8..172369bcb4 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -48,7 +48,7 @@ $lang->project->errorSamePlans     = 'Project cannot be associated with multiple
 $lang->project->errorNoProducts    = 'At least one product is associated';
 $lang->project->copyNoProject      = 'There are no items available to copy.';
 $lang->project->searchByName       = 'Enter the project name to retrieve';
-$lang->project->deleted            = 'Deleted';
+$lang->project->deleted            = 'Supprimé';
 $lang->project->linkedProducts     = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts   = "Unlinked {$lang->productCommon}s";
 $lang->project->testreport         = 'Testreport';

From 17a439cac344db7bd302ebc17c63dda10f4028d2 Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Wed, 24 Aug 2022 00:55:13 +0000
Subject: [PATCH 17/18] * Finish task #64972,64973,64969.

---
 module/action/css/trash.css | 2 +-
 module/story/lang/fr.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index 08c1abed46..b932d4c1b6 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -10,6 +10,6 @@ td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; alig
 .flex span.label-danger {margin-left: 5px; min-width: 50px;}
 [lang^=en] .flex span.label-danger {min-width: 52px;}
 [lang^=de] .flex span.label-danger {min-width: 58px;}
-[lang^=fr] .flex span.label-danger {min-width: 69px;}
+[lang^=fr] .flex span.label-danger {min-width: 63px;}
 .c-name > .text-ellipsis {text-overflow: clip;}
 
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index f4b2e3c1a0..8701c3006d 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -157,7 +157,7 @@ $lang->story->copy             = "Copier Story";
 $lang->story->total            = "Stories Total";
 $lang->story->draft            = 'Brouillon';
 $lang->story->unclosed         = 'Non Fermées';
-$lang->story->deleted          = 'Supprimée';
+$lang->story->deleted          = 'Supprimé';
 $lang->story->released         = 'Stories Versionnées';
 $lang->story->URChanged        = 'Requirement Changed';
 $lang->story->design           = 'Designs';

From 0e393e120b03ef946a8314a597d933759423f2bf Mon Sep 17 00:00:00 2001
From: dongli <dongli@easycorp.ltd>
Date: Wed, 24 Aug 2022 01:10:59 +0000
Subject: [PATCH 18/18] * Remove useless spaces.

---
 lib/dao/dao.class.php       | 12 ++++++------
 module/action/css/trash.css |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index c6326f5a46..e18d52847f 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -29,7 +29,7 @@ class dao extends baseDAO
     /**
      * 设置需要更新或插入的数据。
      * Set the data to update or insert.
-     * 
+     *
      * @param  object $data  the data object or array
      * @access public
      * @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
 
     /**
      * Check workFlow field rule.
-     * 
+     *
      * @access public
      * @return object the dao object self.
      */
@@ -232,10 +232,10 @@ class dao extends baseDAO
     }
 
     /**
-     * 检查工作流扩展字段 
-     * check workflow extend field 
-     * 
-     * @param  array $fields 
+     * 检查工作流扩展字段
+     * check workflow extend field
+     *
+     * @param  array $fields
      * @access public
      * @return object the dao object self
      */
diff --git a/module/action/css/trash.css b/module/action/css/trash.css
index b932d4c1b6..2c21a2cced 100755
--- a/module/action/css/trash.css
+++ b/module/action/css/trash.css
@@ -12,4 +12,3 @@ td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; alig
 [lang^=de] .flex span.label-danger {min-width: 58px;}
 [lang^=fr] .flex span.label-danger {min-width: 63px;}
 .c-name > .text-ellipsis {text-overflow: clip;}
-