Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

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

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);

module/doc/lang/de.php

@@ -70,15 +70,13 @@ $lang->doc->index            = 'Home';
 $lang->doc->create           = 'Dokument hinzufügen';
 $lang->doc->edit             = 'Bearbeiten';
 $lang->doc->delete           = 'Löschen';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Liste';
 $lang->doc->view             = 'Details';
 $lang->doc->diff             = 'Diff';
 $lang->doc->diffAction       = 'Diff Document';
 $lang->doc->sort             = 'Sortierung';
 $lang->doc->manageType       = 'Kategorie verwalten';
-$lang->doc->createBook       = 'Create Book';
-$lang->doc->manageBook       = 'Manage Book';
-$lang->doc->editBook         = 'Edit Book';
 $lang->doc->editType         = 'Bearbeiten';
 $lang->doc->deleteType       = 'Löschen';
 $lang->doc->addType          = 'Hinzufügen';

module/doc/lang/en.php

@@ -71,15 +71,13 @@ $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Create Document';
 $lang->doc->edit             = 'Edit Document';
 $lang->doc->delete           = 'Delete Document';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Document List';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
 $lang->doc->diffAction       = 'Diff Document';
 $lang->doc->sort             = 'Rank Document';
 $lang->doc->manageType       = 'Manage Category';
-$lang->doc->createBook       = 'Create Book';
-$lang->doc->manageBook       = 'Manage Book';
-$lang->doc->editBook         = 'Edit Book';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
 $lang->doc->addType          = 'Add';

module/doc/lang/fr.php

@@ -70,15 +70,13 @@ $lang->doc->index            = 'Accueil Documents';
 $lang->doc->create           = 'Ajouter Document';
 $lang->doc->edit             = 'Editer Document';
 $lang->doc->delete           = 'Supprimer Document';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Liste Documents';
 $lang->doc->view             = 'Détail Document';
 $lang->doc->diff             = 'Diff';
 $lang->doc->diffAction       = 'Document Diff';
 $lang->doc->sort             = 'Rang Document';
 $lang->doc->manageType       = 'Gérer Catégories';
-$lang->doc->createBook       = 'Create Book';
-$lang->doc->manageBook       = 'Manage Book';
-$lang->doc->editBook         = 'Edit Book';
 $lang->doc->editType         = 'Editer';
 $lang->doc->deleteType       = 'Supprimer';
 $lang->doc->addType          = 'Ajouter';

module/doc/lang/vi.php

@@ -70,15 +70,13 @@ $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Tạo tài liệu';
 $lang->doc->edit             = 'Sửa tài liệu';
 $lang->doc->delete           = 'Xóa tài liệu';
+$lang->doc->createBook       = 'Create Book';
 $lang->doc->browse           = 'Document danh sách';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
 $lang->doc->diffAction       = 'Diff tài liệu';
 $lang->doc->sort             = 'Đánh giá tài liệu';
 $lang->doc->manageType       = 'Quản lý danh mục';
-$lang->doc->createBook       = 'Create Book';
-$lang->doc->manageBook       = 'Manage Book';
-$lang->doc->editBook         = 'Edit Book';
 $lang->doc->editType         = 'Sửa';
 $lang->doc->deleteType       = 'Xóa';
 $lang->doc->addType          = 'Thêm';

module/doc/lang/zh-cn.php

@@ -71,15 +71,13 @@ $lang->doc->index            = '文档主页';
 $lang->doc->create           = '创建文档';
 $lang->doc->edit             = '编辑文档';
 $lang->doc->delete           = '删除文档';
+$lang->doc->createBook       = '创建手册';
 $lang->doc->browse           = '文档列表';
 $lang->doc->view             = '文档详情';
 $lang->doc->diff             = '对比';
 $lang->doc->diffAction       = '对比文档';
 $lang->doc->sort             = '文档排序';
 $lang->doc->manageType       = '维护目录';
-$lang->doc->createBook       = '创建手册';
-$lang->doc->manageBook       = '维护手册';
-$lang->doc->editBook         = '编辑手册';
 $lang->doc->editType         = '编辑目录';
 $lang->doc->deleteType       = '删除目录';
 $lang->doc->addType          = '增加目录';