From d97317d7c46dc5446b2846e89910ceddb3571e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Mon, 30 Aug 2021 16:01:27 +0800 Subject: [PATCH] * fix for set object link. --- module/action/lang/en.php | 2 +- module/action/lang/zh-cn.php | 2 +- module/action/model.php | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index b3270ff3bf..2adcf78cf9 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -483,7 +483,7 @@ $lang->action->label->testtask = 'Request|testtask|view|caseID=%s'; $lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s'; $lang->action->label->caselib = 'Case Library|caselib|view|libID=%s'; $lang->action->label->todo = 'Todo|todo|view|todoID=%s'; -$lang->action->label->doclib = 'Doc Library|doc|objectLibs|type=%s&objectID=%s&libID=%s&docID=&version=&appendLib=%s'; +$lang->action->label->doclib = 'Doc Library|doc|tablecontents|type=%s&objectID=%s&libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; $lang->action->label->testreport = 'Report|testreport|view|report=%s'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 3811ec08eb..92d862a010 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -483,7 +483,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|objectLibs|type=%s&objectID=%s&libID=%s&docID=&version=&appendLib=%s'; +$lang->action->label->doclib = '文档库|doc|tablecontents|type=%s&objectID=%s&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/action/model.php b/module/action/model.php index e2d11ecab6..03821413ed 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1156,7 +1156,25 @@ class actionModel extends model } else { - $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID)); + if($action->objectType == 'doclib') + { + $libID = $action->objectID; + $type = 'custom'; + if($action->execution != 0) $type = 'execution'; + if($action->project != 0) $type = 'project'; + if($action->product != ',0,') $type = 'product'; + + $libObjectID = $type != 'custom' ? $action->$type : ''; + $libObjectID = trim($libObjectID, ','); + if(empty($libObjectID)) return false; + + $params = sprintf($vars, $type, $libObjectID, $libID); + } + else + { + $params = sprintf($vars, $action->objectID); + } + $action->objectLink = helper::createLink($moduleName, $methodName, $params); if($action->objectType == 'doclib') {