From 21d1d641285dc3c9d6e0c86e8c7765130b5d104b Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Tue, 9 Mar 2021 09:10:50 +0800
Subject: [PATCH] * Finish task #36473.

---
 module/datatable/config.php          | 1 +
 module/program/view/project.html.php | 5 ++++-
 module/project/model.php             | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/datatable/config.php b/module/datatable/config.php
index 1976270a91..99efa085bf 100644
--- a/module/datatable/config.php
+++ b/module/datatable/config.php
@@ -2,3 +2,4 @@
 $config->datatable->moduleAlias['product-browse']     = 'story';
 $config->datatable->moduleAlias['execution-task']     = 'task';
 $config->datatable->moduleAlias['testtask-cases']     = 'testcase';
+$config->datatable->moduleAlias['program-project']    = 'project';
diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php
index afb9264707..6a9ac21409 100644
--- a/module/program/view/project.html.php
+++ b/module/program/view/project.html.php
@@ -15,6 +15,9 @@
 js::set('programID', $programID);
 js::set('browseType', $browseType);
 ?>
+<style>
+.project-type-label.label-outline {width: 47px;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolBar pull-left">
     <?php foreach($lang->program->featureBar as $key => $label):?>
@@ -69,7 +72,7 @@ js::set('browseType', $browseType);
           <?php foreach($projectStats as $project):?>
           <tr data-id="<?php echo $project->id;?>">
             <?php $project->from = 'pgmproject';?>
-            <?php foreach($setting as $value) $this->program->printCell($value, $project, $users, $programID);?>
+            <?php foreach($setting as $value) $this->project->printCell($value, $project, $users, $programID);?>
           </tr>
           <?php endforeach;?>
         </tbody>
diff --git a/module/project/model.php b/module/project/model.php
index 9704e0f6e7..0c6e9576b3 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1096,9 +1096,9 @@ class projectModel extends model
                     }
                     break;
                 case 'name':
+                    if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
+                    if($project->model === 'scrum')     echo "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
                     echo html::a($projectLink, $project->name);
-                    if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span>";
-                    if($project->model === 'scrum')     echo "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span>";
                     break;
                 case 'PM':
                     $user   = $this->loadModel('user')->getByID($project->PM, 'account');