From f0276c001bbf62496e1dcf38ed8b0b37d6db53d6 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 27 Aug 2020 11:18:30 +0800
Subject: [PATCH] * Finish task#7705.

---
 module/block/view/recentprogramblock.html.php |  3 ++-
 module/program/model.php                      |  8 +++++---
 module/project/model.php                      | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php
index 27a1c35d0a..50c64f19ed 100644
--- a/module/block/view/recentprogramblock.html.php
+++ b/module/block/view/recentprogramblock.html.php
@@ -35,7 +35,8 @@
   <div class='col' data-id='<?php echo $programID?>'>
     <div class='panel' data-url='<?php echo $this->createLink('program', 'index', "programID=$program->id");?>'>
       <div class='panel-heading'>
-        <strong class='program-name' title='<?php echo $program->name;?>'> <?php echo html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?> </strong>
+        <?php $parentName = $program->parentName ? $program->parentName . '/' : '';?>
+        <strong class='program-name' title='<?php echo $parentName . $program->name;?>'> <?php echo html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $parentName . $program->name);?> </strong>
         <?php if($program->template === 'cmmi'): ?>
         <span class='program-type-label label label-warning label-outline'><?php echo $lang->program->cmmi; ?></span>
         <?php else: ?>
diff --git a/module/program/model.php b/module/program/model.php
index 2aa26b840b..0699da9b02 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -184,6 +184,7 @@ class programModel extends model
         /* Init vars. */
         $this->loadModel('project');
         $programs = $this->getList($status, $orderBy, $pager);
+
         if(empty($programs)) return array();
 
         $programIdList = array_keys($programs);
@@ -208,9 +209,10 @@ class programModel extends model
         foreach($programs as $programID => $program)
         {
             $orderBy = $program->template == 'cmmi' ? 'id_asc' : 'id_desc';
-            $program->projects  = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
-            $program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0;
-            $program->estimate  = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
+            $program->projects   = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
+            $program->teamCount  = isset($teams[$programID]) ? $teams[$programID]->count : 0;
+            $program->estimate   = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
+            $program->parentName = $this->project->getProjectParentName($program->parent);
         }
 
         return $programs;
diff --git a/module/project/model.php b/module/project/model.php
index b5bebd07da..01747bbcf4 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2888,6 +2888,23 @@ class projectModel extends model
         return $chartData;
     }
 
+    /**
+     * Gets the top-level project name.
+     *
+     * @access private
+     * @return void
+     */
+    public function getProjectParentName($parentID = 0)
+    {
+        if($parentID == 0) return '';
+
+        static $parent;
+        $parent = $this->dao->select('id,parent,name')->from(TABLE_PROJECT)->where('id')->eq($parentID)->fetch();
+        if($parent->parent) $this->getProjectParentName($parent->parent);
+
+        return $parent->name;
+    }
+
     /**
      * Fill tasks in tree.
      * @param  object $tree