From 88230cd949ec07937a9350baa838829aa262feeb Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 15 Mar 2022 15:49:25 +0800
Subject: [PATCH 1/2] * Fix bug #20779,20782,20783.

---
 extension/lite/execution/ext/model/lite.php     | 2 +-
 extension/lite/user/ext/view/execution.html.php | 3 ---
 module/doc/lang/en.php                          | 1 +
 module/doc/lang/zh-cn.php                       | 1 +
 module/doc/model.php                            | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php
index 3773fe3daa..c3d5f927f4 100644
--- a/extension/lite/execution/ext/model/lite.php
+++ b/extension/lite/execution/ext/model/lite.php
@@ -25,7 +25,7 @@ public function setMenu($executionID, $buildID = 0, $extra = '')
     $modulePageNav .= "<ul class='dropdown-menu'>";
     foreach($kanbanList as $kanbanID => $kanban)
     {
-        $modulePageNav .=  '<li>' . html::a(helper::createLink('execution', $this->app->rawMethod, "execution=$kanban->id"), $kanban->name) . '</li>';
+        $modulePageNav .=  '<li>' . html::a(helper::createLink($this->app->rawModule, $this->app->rawMethod, "execution=$kanban->id"), $kanban->name) . '</li>';
     }
     $modulePageNav .= "</ul></div></div>";
 
diff --git a/extension/lite/user/ext/view/execution.html.php b/extension/lite/user/ext/view/execution.html.php
index 6b6c8d08f8..fca1be387c 100644
--- a/extension/lite/user/ext/view/execution.html.php
+++ b/extension/lite/user/ext/view/execution.html.php
@@ -36,9 +36,6 @@
         <tr>
           <td><?php echo html::a($executionLink, $execution->id);?></td>
           <td>
-            <?php if(isset($config->maxVersion)):?>
-            <span class='project-type-label label label-info label-outline'><?php echo zget($lang->user->executionTypeList, $execution->type);?></span>
-            <?php endif;?>
             <?php echo html::a($executionLink, $execution->name);?>
           </td>
           <?php if(isset($execution->delay)):?>
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 9af7f23758..1f5c138078 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -89,6 +89,7 @@ $lang->doc->diffAction       = 'Diff Document';
 $lang->doc->sort             = 'Rank Document';
 $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
+$lang->doc->editChildType    = 'Edit';
 $lang->doc->deleteType       = 'Delete';
 $lang->doc->addType          = 'Add';
 $lang->doc->childType        = 'Directory';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 255a1f793f..f929a40d98 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -89,6 +89,7 @@ $lang->doc->diffAction       = '对比文档';
 $lang->doc->sort             = '文档排序';
 $lang->doc->manageType       = '维护目录';
 $lang->doc->editType         = '编辑目录';
+$lang->doc->editChildType    = '编辑子目录';
 $lang->doc->deleteType       = '删除目录';
 $lang->doc->addType          = '增加目录';
 $lang->doc->childType        = '子目录';
diff --git a/module/doc/model.php b/module/doc/model.php
index c6befca2f6..4bd060690e 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2475,7 +2475,7 @@ EOT;
                 {
                     $li .= "<div class='tree-actions'>";
                     if(common::hasPriv('tree', 'edit'))   $li .= html::a(helper::createLink('tree', 'edit', "module=$module->id&type=doc"), "<i class='icon icon-edit'></i>", '', "data-toggle='modal' title={$this->lang->doc->editType}");
-                    if(common::hasPriv('tree', 'browse')) $li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "<i class='icon icon-split'></i>", '', "class='iframe' title={$this->lang->doc->editType}");
+                    if(common::hasPriv('tree', 'browse')) $li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "<i class='icon icon-split'></i>", '', "class='iframe' title={$this->lang->doc->editChildType}");
                     $li .= '</div>';
                 }
                 $li .= '</div>';

From 72095bf38ae81ede74ccff7cf086b4e20edabad8 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 15 Mar 2022 16:31:27 +0800
Subject: [PATCH 2/2] * Fix bug #20803.

---
 module/user/view/story.html.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index c19414a157..e1827571b2 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -41,21 +41,23 @@
       <?php $vars = "userID={$user->id}&storyType=$storyType&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
       <thead>
         <tr class='colhead'>
-          <th class='w-id'>   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
-          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-id'>   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <?php if($this->config->vision == 'lite'):?>
-          <th class='w-200px'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->project);?></th>
+          <th class='c-product'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->project);?></th>
           <?php else:?>
-          <th class='w-200px'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->product);?></th>
+          <th class='c-product'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->product);?></th>
           <?php endif;?>
           <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
           <?php if($storyType != 'requirement' and $this->config->vision != 'lite'):?>
-          <th class='w-150px'><?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
+          <th class='c-plan'><?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
+          <?php endif;?>
+          <th class='c-openedBy'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='c-estimate text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+          <?php if($this->config->vision != 'lite'):?>
+          <th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
           <?php endif;?>
-          <th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-          <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-          <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-100px'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
         </tr>
       </thead>
       <tbody>
@@ -72,7 +74,9 @@
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td class='estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
           <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
+          <?php if($this->config->vision != 'lite'):?>
           <td><?php echo $lang->story->stageList[$story->stage];?></td>
+          <?php endif;?>
         </tr>
         <?php endforeach;?>
       </tbody>