From f54b412c3b7c2a7a200684cda5dbf8ee65c075b8 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 31 Oct 2022 17:11:39 +0800
Subject: [PATCH 1/3] * Modify project icon.

---
 module/product/view/project.html.php | 3 ++-
 module/project/model.php             | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index ad6e28023b..991296f125 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -83,7 +83,8 @@
             <?php
             if($config->systemMode == 'new')
             {
-                echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name, '', "title='{$project->name} ({$lang->project->{$project->model}})'");
+                $projectType = $project->model == 'scrum' ? 'sprint' : $project->model;
+                echo html::a($this->createLink('project', 'index', 'project=' . $project->id), "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "title='{$project->name}'");
             }
             else
             {
diff --git a/module/project/model.php b/module/project/model.php
index 94c8d58ae7..09ee019c4a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1978,7 +1978,7 @@ class projectModel extends model
             elseif($id == 'name')
             {
                 $class .= ' text-left';
-                $title  = "title='{$project->name}" . ($this->config->vision == 'lite' ? "'" : "({$this->lang->project->{$project->model}})'");
+                $title  = "title='{$project->name}'";
             }
             elseif($id == 'PM')
             {
@@ -2022,9 +2022,10 @@ class projectModel extends model
                     $prefix = '';
                     $suffix = '';
                     if(isset($project->delay)) $suffix = "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
+                    $projectType = $project->model == 'scrum' ? 'sprint' : $project->model;
                     if(!empty($suffix) or !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
                     if(!empty($prefix)) echo $prefix;
-                    echo html::a($projectLink, $project->name, '', "class='text-ellipsis text-primary'");
+                    echo html::a($projectLink, "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "class='text-ellipsis text-primary'");
                     if(!empty($suffix)) echo $suffix;
                     if(!empty($suffix) or !empty($prefix)) echo '</div>';
                     break;

From 13f53cc5bcb3296a2997eecdafe4c8813ef0376d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 1 Nov 2022 14:28:03 +0800
Subject: [PATCH 2/3] * Fix bug #28998.

---
 module/task/model.php          | 3 ++-
 module/task/view/view.html.php | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index ba26762096..3fc5bc1cc6 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3748,7 +3748,8 @@ class taskModel extends model
                 }
                 break;
             case 'pri':
-                echo "<span class='label-pri label-pri-" . $task->pri . "' title='" . zget($this->lang->task->priList, $task->pri, $task->pri) . "'>";
+                $priClass = $task->pri ? "label-pri label-pri-{$task->pri}" : '';
+                echo "<span class='$priClass' title='" . zget($this->lang->task->priList, $task->pri, $task->pri) . "'>";
                 echo zget($this->lang->task->priList, $task->pri, $task->pri);
                 echo "</span>";
                 break;
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index d2635cbcdb..d749f57e41 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -116,13 +116,7 @@
               <?php foreach($task->children as $child):?>
               <tr class='text-center'>
                 <td><?php echo $child->id;?></td>
-                <td>
-                  <?php
-                  echo "<span class='label-pri label-pri-" . $child->pri . "'>";
-                  echo $child->pri == '0' ? '' : zget($this->lang->task->priList, $child->pri, $child->pri);
-                  echo "</span>";
-                  ?>
-                </td>
+                <td><?php if($child->pri) echo "<span class='label-pri label-pri-" . $child->pri . "'>" . zget($this->lang->task->priList, $child->pri, $child->pri) . "</span>";?></td>
                 <td class='text-left' title='<?php echo $child->name;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('task', 'view', "taskID=$child->id", '', true); ?>"><?php echo $child->name;?></a></td>
                 <td><?php echo $child->deadline;?></td>
                 <td id='assignedTo'><?php $this->task->printAssignedHtml($child, $users);?></td>

From e6559ea155e34a8a6727ed0ce7dd9b03a74bbea1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 1 Nov 2022 14:35:02 +0800
Subject: [PATCH 3/3] * Fix bug #28181.

---
 module/project/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/config.php b/module/project/config.php
index 3aa217d11c..ca190f5822 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -69,7 +69,7 @@ $config->project->datatable->fieldList['PM']['pri']      = '2';
 
 $config->project->datatable->fieldList['status']['title']    = 'status';
 $config->project->datatable->fieldList['status']['fixed']    = 'left';
-$config->project->datatable->fieldList['status']['width']    = '65';
+$config->project->datatable->fieldList['status']['width']    = '75';
 $config->project->datatable->fieldList['status']['required'] = 'no';
 $config->project->datatable->fieldList['status']['sort']     = 'yes';
 $config->project->datatable->fieldList['status']['pri']      = '2';