* fix for set object link.

This commit is contained in:
王怡栋
2021-08-30 16:01:27 +08:00
parent 7ea86a2161
commit d97317d7c4
3 changed files with 21 additions and 3 deletions
+1 -1
View File
@@ -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';
+1 -1
View File
@@ -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';
+19 -1
View File
@@ -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')
{