From e5c2ac79e45fc56a2aded93340233b26aa9a8764 Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Thu, 2 Jan 2025 16:37:55 +0800 Subject: [PATCH] * [task#135778,doing,1h]. --- module/doc/config.php | 2 +- module/execution/ui/task.html.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/doc/config.php b/module/doc/config.php index 4dd97bbb95..8cb2d65106 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -137,7 +137,7 @@ $config->doc->zentaoList['story']['subMenu'][] = array('key' => 'planStory', $config->doc->zentaoList['case']['subMenu'][] = array('key' => 'productCase', 'name' => $lang->doc->zentaoList['productCase'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'product', 'method' => 'browse', 'params' => ''); $config->doc->zentaoList['case']['subMenu'][] = array('key' => 'caselib', 'name' => $lang->doc->zentaoList['caselib'] . $lang->doc->list, 'icon' => 'usecase', 'module' => 'product', 'method' => 'browse', 'params' => ''); -$config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'productBug', 'name' => $lang->doc->zentaoList['productBug'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'product', 'method' => 'browse', 'params' => ''); +$config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'productBug', 'name' => $lang->doc->zentaoList['productBug'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'bug', 'method' => 'browse', 'params' => 'productID=0&branch=&browseType=¶m=0&orderBy=&recTotal=0&recPerPage=20&pageID=1&from=doc'); $config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'planBug', 'name' => $lang->doc->zentaoList['planBug'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'product', 'method' => 'browse', 'params' => ''); $config->doc->zentaoList['more']['subMenu'][] = array('key' => 'productPlan', 'name' => $lang->doc->zentaoList['productPlan'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'browse', 'params' => 'productID=0&branch=&browseType=undone&queryID=0&orderBy=begin_desc&recTotal=0&recPerPage=20&pageID=1&from=doc', 'priv' => 'productplanBrowse'); diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 3889d36b50..13fbb41aa2 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -30,8 +30,9 @@ if($isFromDoc) ( setID('zentaolist'), setClass('mb-4-important'), - set::title(sprintf($this->lang->doc->insertTitle, $this->lang->doc->zentaoList[$blockType])), + set::title(sprintf($this->lang->doc->insertTitle, $this->lang->doc->zentaoList['task'])), set::actions(array()), + set::showExtra(false), to::titleSuffix ( span @@ -69,7 +70,7 @@ if($isFromDoc) featureBar ( set::current($browseType), - set::linkParams("executionID={$executionID}&status={key}¶m={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), + set::linkParams("executionID={$executionID}&status={key}¶m={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&from=$from&blockID=$blockID"), set::isModal($isFromDoc), set::queryMenuLinkCallback(array(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink))), li(searchToggle