From 431a832cda35bbb7262e4aec354037ccb750da94 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 14 Jun 2022 08:13:25 +0000
Subject: [PATCH] sprint_204_57094

---
 module/execution/control.php        | 10 +++++++
 module/execution/view/view.html.php | 46 +++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index 0a00c2ed82..9e1ca035c1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2044,6 +2044,16 @@ class execution extends control
 
         $executionID = $this->execution->saveState((int)$executionID, $this->executions);
         $execution   = $this->execution->getById($executionID, true);
+
+        $execution->projectInfo = $this->loadModel('project')->getByID($execution->project);
+
+        if($this->config->systemMode == 'new')
+        {
+            $programList = array_filter(explode(',', $execution->projectInfo->path));
+            array_pop($programList);
+            $this->view->programList = $this->loadModel('program')->getPairsByList($programList);
+        }
+
         $type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban';
         if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));
 
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 70661107d5..80e408e738 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -174,6 +174,52 @@
                 </p>
               </div>
             </div>
+            <?php if($this->config->systemMode == 'new'):?>
+            <div class="detail">
+              <div class="detail-title">
+                <strong><?php echo $lang->project->parent;?></strong>
+              </div>
+              <div class="detail-content">
+                <div class="row row-grid">
+                  <div class="col-xs-6">
+                  <?php if($execution->projectInfo->grade > 1):?>
+                    <i class='icon icon-program text-muted'></i>
+                    <?php
+                    $end = end($programList);
+                    reset($programList);
+                    foreach($programList as $ID => $name)
+                    {
+                        if($name != $end)
+                        {
+                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/';
+                        }
+                        else
+                        {
+                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name);
+                        }
+                    }
+                    ?>
+                  <?php endif;?>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <?php endif;?>
+            <?php if($this->config->systemMode == 'new'):?>
+            <div class="detail">
+              <div class="detail-title">
+                <strong><?php echo $lang->project->project;?></strong>
+              </div>
+              <div class="detail-content">
+                <div class="row row-grid">
+                  <div class="col-xs-6">
+                    <i class='icon icon-project text-muted'></i>
+                    <?php echo html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name, '', 'class="text-ellipsis text-primary"')?>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <?php endif;?>
             <?php if(!in_array($execution->attribute, array('request', 'design', 'review'))): ?>
             <div class="detail">
               <div class="detail-title">