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 1/6] 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">

From d84c0bf80b537637cc27d00c13032e294cc7021e Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 14 Jun 2022 09:00:35 +0000
Subject: [PATCH 2/6] sprint_204_57094

---
 module/execution/view/view.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 80e408e738..0ee36a3047 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -181,7 +181,7 @@
               </div>
               <div class="detail-content">
                 <div class="row row-grid">
-                  <div class="col-xs-6">
+                  <div class="col-xs-12">
                   <?php if($execution->projectInfo->grade > 1):?>
                     <i class='icon icon-program text-muted'></i>
                     <?php
@@ -191,7 +191,7 @@
                     {
                         if($name != $end)
                         {
-                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/';
+                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/ ';
                         }
                         else
                         {
@@ -212,7 +212,7 @@
               </div>
               <div class="detail-content">
                 <div class="row row-grid">
-                  <div class="col-xs-6">
+                  <div class="col-xs-12">
                     <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>

From 1b2cd0651be6c7b9811469b14f7b10c43b58f949 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Tue, 14 Jun 2022 09:05:28 +0000
Subject: [PATCH 3/6] sprint_204_57094

---
 module/execution/view/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 0ee36a3047..0768f28b86 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -214,7 +214,7 @@
                 <div class="row row-grid">
                   <div class="col-xs-12">
                     <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"')?>
+                    <?php echo html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name)?>
                   </div>
                 </div>
               </div>

From a99aed925fe0c54e2c5d697bd807aac7e01ab374 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 15 Jun 2022 01:42:06 +0000
Subject: [PATCH 4/6] sprint_204_57094

---
 module/execution/view/view.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 0768f28b86..b038f47f7c 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -191,11 +191,11 @@
                     {
                         if($name != $end)
                         {
-                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/ ';
+                            echo strpos(",{$app->user->view->programs},", ",$ID,") !== false ? html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/ ' : $name . '/ ';
                         }
                         else
                         {
-                            echo html::a($this->createLink('program', 'product', "programID=$ID"), $name);
+                            echo strpos(",{$app->user->view->programs},", ",$ID,") !== false ? html::a($this->createLink('program', 'product', "programID=$ID"), $name) : $name;
                         }
                     }
                     ?>
@@ -214,7 +214,7 @@
                 <div class="row row-grid">
                   <div class="col-xs-12">
                     <i class='icon icon-project text-muted'></i>
-                    <?php echo html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name)?>
+                    <?php echo strpos(",{$app->user->view->projects},", ",$execution->project,") !== false ? html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name) : $execution->projectInfo->name;?>
                   </div>
                 </div>
               </div>

From b4c2ecbb2f37380143ff285586055b866a381fd1 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 15 Jun 2022 03:02:18 +0000
Subject: [PATCH 5/6] sprint_204_57094

---
 module/execution/view/view.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index b038f47f7c..683cfb5e2a 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -187,15 +187,15 @@
                     <?php
                     $end = end($programList);
                     reset($programList);
-                    foreach($programList as $ID => $name)
+                    foreach($programList as $id => $name)
                     {
                         if($name != $end)
                         {
-                            echo strpos(",{$app->user->view->programs},", ",$ID,") !== false ? html::a($this->createLink('program', 'product', "programID=$ID"), $name) . '/ ' : $name . '/ ';
+                            echo  common::hasPriv('program', 'product')? html::a($this->createLink('program', 'product', "programID=$id"), $name) . '/ ' : $name . '/ ';
                         }
                         else
                         {
-                            echo strpos(",{$app->user->view->programs},", ",$ID,") !== false ? html::a($this->createLink('program', 'product', "programID=$ID"), $name) : $name;
+                            echo common::hasPriv('program', 'product') ? html::a($this->createLink('program', 'product', "programID=$id"), $name) : $name;
                         }
                     }
                     ?>
@@ -214,7 +214,7 @@
                 <div class="row row-grid">
                   <div class="col-xs-12">
                     <i class='icon icon-project text-muted'></i>
-                    <?php echo strpos(",{$app->user->view->projects},", ",$execution->project,") !== false ? html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name) : $execution->projectInfo->name;?>
+                    <?php echo common::hasPriv('project', 'index') ? html::a($this->createLink('project', 'index', "projectID=$execution->project", '', '', $execution->project), $execution->projectInfo->name) : $execution->projectInfo->name;?>
                   </div>
                 </div>
               </div>

From 1ff7d29c998cbae688d8b6a5b682928feef8ed8b Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 15 Jun 2022 03:07:20 +0000
Subject: [PATCH 6/6] sprint_204_57094

---
 module/execution/view/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 683cfb5e2a..5e9ea8e2da 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -191,7 +191,7 @@
                     {
                         if($name != $end)
                         {
-                            echo  common::hasPriv('program', 'product')? html::a($this->createLink('program', 'product', "programID=$id"), $name) . '/ ' : $name . '/ ';
+                            echo common::hasPriv('program', 'product')? html::a($this->createLink('program', 'product', "programID=$id"), $name) . '/ ' : $name . '/ ';
                         }
                         else
                         {