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');
     }