From fce0f3aafa6d51e4b05aa56eb461b2c43bd6793a Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 20 Oct 2021 16:04:44 +0800
Subject: [PATCH]  * Fix bug #15592.

---
 module/doc/model.php             |  4 ++--
 module/tree/view/browse.html.php | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 59a14f0f27..2816c39247 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -78,8 +78,8 @@ class docModel extends model
         {
             $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
                 ->where('deleted')->eq(0)
-                ->beginIF($type and $type != 'api')->andWhere('type')->eq($type)->fi()
-                ->andWhere('type')->ne('api')
+                ->beginIF($type)->andWhere('type')->eq($type)->fi()
+                ->beginIF(!$type)->andWhere('type')->ne('api')->fi()
                 ->orderBy('`order`, id desc')->query();
         }
 
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 46d6946d32..385c32c2be 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -32,6 +32,19 @@ $childTitle = $lang->tree->child;
 if(strpos($viewType, 'feedback') !== false) $childTitle = $lang->tree->subCategory;
 if(strpos($viewType, 'doc') !== false or $viewType == 'api') $childTitle = $lang->doc->childType;
 if($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') $childTitle = '';
+
+$editTitle   = $lang->tree->edit;
+$deleteTitle = $lang->tree->delete;
+if($viewType == 'feedback')
+{
+    $editTitle   = $lang->tree->editCategory;
+    $deleteTitle = $lang->tree->delCategory;
+}
+if($viewType == 'doc' or $viewType == 'api')
+{
+    $editTitle   = $lang->doc->editType;
+    $deleteTitle = $lang->doc->deleteType;
+}
 ?>
 <!--div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -224,13 +237,13 @@ $(function()
             edit:
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'edit', "moduleID={0}&type=$viewType"); ?>',
-                title: '<?php echo $viewType == 'doc' ? $lang->doc->editType : ($viewType == 'feedback' ? $lang->tree->editCategory : $lang->tree->edit);?>',
+                title: '<?php echo $editTitle;?>',
                 template: '<a><i class="icon-edit"></i></a>'
             },
             "delete":
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'delete', "rootID=$rootID&moduleID={0}"); ?>',
-                title: '<?php echo $viewType == 'doc' ? $lang->doc->deleteType : ($viewType == 'feedback' ? $lang->tree->delCategory : $lang->tree->delete)?>',
+                title: '<?php echo $deleteTitle;?>',
                 template: '<a><i class="icon-trash"></i></a>'
             },
             subModules: