From 3037621f77d1fd1657178544b2b8a7f9b41b76ae Mon Sep 17 00:00:00 2001 From: mayue Date: Tue, 15 Feb 2022 15:07:54 +0800 Subject: [PATCH] * Fix bug #19569. --- module/action/config.php | 2 +- module/action/view/trash.html.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/action/config.php b/module/action/config.php index 940dbfaf97..5e5338b26c 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -56,4 +56,4 @@ $config->action->majorList['execution'] = array('opened', 'edited'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; $config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,'; -$config->action->noLinkModules = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,'; +$config->action->noLinkModules = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,'; diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index 7d4c51f731..011ef69af1 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -62,6 +62,11 @@ $params = "libID=0&moduelID=0&apiID={$action->objectID}"; $methodName = 'index'; } + if(strpos('traincourse,traincontents', $module) !== false) + { + $methodName = $module == 'traincourse' ? 'viewcourse' : 'viewchapter'; + $module = 'traincourse'; + } if(isset($config->action->customFlows[$action->objectType])) { $flow = $config->action->customFlows[$action->objectType];