From 0e35084fe18b928e3b0ec5afb867dfe034f5ef01 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 27 Mar 2024 16:06:28 +0800
Subject: [PATCH] * Compatible ipd project::execution.

---
 module/execution/model.php           | 1 +
 module/project/ui/execution.html.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index bbbb78ac0c..a6666ff389 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4749,6 +4749,7 @@ class executionModel extends model
 
             /* Append tasks and child stages. */
             if(!empty($execution->tasks)) $rows = $this->appendTasks($execution->tasks, $rows);
+            if(!empty($execution->points)) $rows = $this->appendPoints($execution->points, $rows);
         }
 
         return $rows;
diff --git a/module/project/ui/execution.html.php b/module/project/ui/execution.html.php
index bdfd292ab7..860e6bc901 100644
--- a/module/project/ui/execution.html.php
+++ b/module/project/ui/execution.html.php
@@ -60,11 +60,16 @@ $fnGenerateCols = function() use ($config, $project)
         $fieldList['actions']['actionsMap']['edit']['data-size'] = 'md';
         $fieldList['actions']['actionsMap']['edit']['url'] = createLink('programplan', 'edit', "stageID={rawID}&projectID={projectID}");
     }
+    if(!$this->cookie->showStage)
+    {
+        $fieldList['name']['type'] = 'title';
+        if(!in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) unset($fieldList['name']['nestedToggle']);
+    }
 
     if(!$this->cookie->showTask)
     {
         $fieldList['name']['type'] = 'title';
-        if(!in_array($project->model, array('waterfall', 'waterfallplus'))) unset($fieldList['name']['nestedToggle']);
+        if(!in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) unset($fieldList['name']['nestedToggle']);
     }
     if(!$project->hasProduct) unset($fieldList['productName']);