From 8d5ac5bbc51635d4cd202c890ce8fe8b36fd1915 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Thu, 15 Apr 2021 09:37:48 +0800
Subject: [PATCH] * Finish task#37525.

---
 module/action/lang/zh-cn.php |  2 +-
 module/doc/control.php       | 32 +++++++-------------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index f077c8ff35..9d5287d982 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -453,7 +453,7 @@ $lang->action->label->testtask    = '测试单|testtask|view|caseID=%s';
 $lang->action->label->testsuite   = '测试套件|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = '用例库|caselib|view|libID=%s';
 $lang->action->label->todo        = '待办|todo|view|todoID=%s';
-$lang->action->label->doclib      = '文档库|doc|doclibbrowse|libID=%s';
+$lang->action->label->doclib      = '文档库|doc|objectLibs|type=&objectID=&libID=%s';
 $lang->action->label->doc         = '文档|doc|view|docID=%s';
 $lang->action->label->user        = '用户|user|view|account=%s';
 $lang->action->label->testreport  = '报告|testreport|view|report=%s';
diff --git a/module/doc/control.php b/module/doc/control.php
index e90b33ef34..243d21367b 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -780,31 +780,6 @@ class doc extends control
         die(js::locate('back'));
     }
 
-    /**
-     * Doc lib browse.
-     *
-     * @param  int    $libID
-     * @access public
-     * @return void
-     */
-    public function doclibBrowse($libID = 0)
-    {
-        $doclib = $this->doc->getLibById($libID);
-
-        $objecitID = 0;
-        if($doclib->type == 'product')
-        {
-            $objectID = $doclib->product;
-        }
-        elseif($doclib->type == 'project' or $doclib->type == 'execution')
-        {
-            $doclib->type = 'project';
-            $objectID = $doclib->project;
-        }
-
-        die(js::locate($this->createLink('doc', 'objectLibs', "type={$doclib->type}&objectID=$objectID&libID=$libID")));
-    }
-
     /**
      * Show libs for product or project.
      *
@@ -818,6 +793,13 @@ class doc extends control
      */
     public function objectLibs($type, $objectID = 0, $libID = 0, $docID = 0, $version = 0)
     {
+        if(empty($type))
+        {
+            $doclib   = $this->doc->getLibById($libID);
+            $type     = $doclib->type == 'execution' ? 'project' : $doclib->type;
+            $objectID = $type == 'custom' ? 0 : $doclib->$type;
+        }
+
         $this->session->set('docList', $this->app->getURI(true), $this->app->openApp);
 
         $objects = $this->doc->getOrderedObjects($type);