From 5a8089c3fbdff1b48683c16eb5f85cb9a88d1177 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 22 Apr 2022 09:30:05 +0800
Subject: [PATCH] * Fix bug from max #15833.

---
 module/my/view/task.html.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 66cc88ef0d..68520fe242 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -14,6 +14,7 @@
 <?php js::set('mode', $mode);?>
 <?php js::set('total', $pager->recTotal);?>
 <?php js::set('rawMethod', $app->rawMethod);?>
+<?php $this->app->loadLang('task');?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
@@ -48,26 +49,28 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-          <th class='c-name'><?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
+          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-name'><?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
           <?php if($config->systemMode == 'new'):?>
-          <th class='c-project'><?php common::printOrderLink('project',    $orderBy, $vars, $lang->my->projects);?></th>
+          <th class='c-project'><?php common::printOrderLink('project',   $orderBy, $vars, $lang->my->projects);?></th>
+          <th class='c-project'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
+          <?php else:?>
+          <th class='c-project'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->my->executions);?></th>
           <?php endif;?>
-          <th class='c-project'><?php common::printOrderLink('execution',  $orderBy, $vars, $lang->my->executions);?></th>
           <?php if($type != 'openedBy'): ?>
-          <th class='c-user'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <?php endif;?>
-          <th class='c-date text-center'><?php common::printOrderLink('deadline',   $orderBy, $vars, $lang->task->deadlineAB);?></th>
+          <th class='c-date text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <?php if($type != 'assignedTo'): ?>
           <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
           <?php endif;?>
           <?php if($type != 'finishedBy'): ?>
           <th class='c-user'><?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedBy);?></th>
           <?php endif;?>
-          <th class='c-hours'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->task->estimateAB);?></th>
-          <th class='c-hours'><?php common::printOrderLink('consumed',   $orderBy, $vars, $lang->task->consumedAB);?></th>
-          <th class='c-hours'><?php common::printOrderLink('left',       $orderBy, $vars, $lang->task->leftAB);?></th>
-          <th class='c-status'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='c-hours'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
+          <th class='c-hours'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
+          <th class='c-hours'><?php common::printOrderLink('left',     $orderBy, $vars, $lang->task->leftAB);?></th>
+          <th class='c-status'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-actions-6'><?php echo $lang->actions;?></th>
         </tr>
       </thead>