From 133eac3fb65b7fe02a621d176078ba910bb7197a Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Tue, 3 Aug 2021 08:57:44 +0800
Subject: [PATCH] * Resolved issue #368.

---
 module/my/view/bug.html.php  | 4 ++--
 module/my/view/task.html.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index d137a7288d..2dd32e1d37 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -62,7 +62,7 @@
           <th class='w-90px'> <?php common::printOrderLink('openedBy',    $orderBy, $vars, $lang->openedByAB);?></th>
           <?php endif;?>
           <?php if($app->rawMethod == 'work'):?>
-          <th class='w-90px text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadline);?></th>
+          <th class='w-70px text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadlineAB);?></th>
           <?php endif;?>
           <?php if($type != 'assignedTo'): ?>
           <th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
@@ -114,7 +114,7 @@
           <td><?php echo zget($users, $bug->openedBy);?></td>
           <?php endif;?>
           <?php if($app->rawMethod == 'work'):?>
-          <td class="text-center <?php echo (isset($bug->delay) and $bug->status == 'active') ? 'delayed' : '';?>"><?php if(substr($bug->deadline, 0, 4) > 0) echo $bug->deadline;?></td>
+          <td class="text-center <?php echo (isset($bug->delay) and $bug->status == 'active') ? 'delayed' : '';?>"><?php if(substr($bug->deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?></td>
           <?php endif;?>
           <?php if($type != 'assignedTo'): ?>
           <td class='c-assignedTo has-btn'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 909adcd13f..1c777b2ce0 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -55,7 +55,7 @@
           <th class='c-user w-90px'>       <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
           <?php endif;?>
           <?php if($app->rawMethod == 'work'):?>
-          <th class='w-90px text-center'>  <?php common::printOrderLink('deadline',   $orderBy, $vars, $lang->task->deadline);?></th>
+          <th class='w-70px text-center'>  <?php common::printOrderLink('deadline',   $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <?php endif;?>
           <?php if($type != 'assignedTo'): ?>
           <th class='c-assignedTo w-110px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
@@ -95,7 +95,7 @@
           <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
           <?php endif;?>
           <?php if($app->rawMethod == 'work'):?>
-          <td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+          <td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
           <?php endif;?>
           <?php if($type != 'assignedTo'): ?>
           <td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
@@ -159,7 +159,7 @@
             <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
             <?php endif;?>
             <?php if($app->rawMethod == 'work'):?>
-            <td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo $child->deadline;?></td>
+            <td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?></td>
             <?php endif;?>
             <?php if($type != 'assignedTo'): ?>
             <td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($child, $users);?></td>