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] * 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>';