* Finish task #64969.

2022-08-19 04:57:54 +00:00
parent a68ba64ad8
commit 730c638598
4 changed files with 37 additions and 3 deletions
@@ -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;