From 5a708667badf308d055365587f7266d4e4bab637 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 12 Apr 2021 14:03:37 +0800 Subject: [PATCH] * Finish task#37386. --- module/action/lang/zh-cn.php | 2 +- module/doc/control.php | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index b481d4519b..109c822529 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -454,7 +454,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|browse|libID=%s'; +$lang->action->label->doclib = '文档库|doc|doclibbrowse|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 fbfbde6815..cd0337040a 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -623,7 +623,7 @@ class doc extends control { $doc = $this->doc->getByID($docID); $objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type'); - if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution'; + if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution'; $this->doc->delete(TABLE_DOC, $docID); /* if ajax request, send result. */ @@ -969,6 +969,31 @@ 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. *