From c5bb7fd69bbf11971fc4cdff754129c3275b3205 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 29 Jun 2023 16:51:27 +0800 Subject: [PATCH] * Fix search bug on my page. --- module/common/lang/menu.php | 12 ++++++------ module/my/ui/bug.html.php | 2 +- module/my/ui/doc.html.php | 2 +- module/my/ui/requirement.html.php | 2 +- module/my/ui/story.html.php | 2 +- module/my/ui/task.html.php | 2 +- module/my/ui/testcase.html.php | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index c754b2cbf6..9633baf145 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -109,8 +109,8 @@ $lang->my->menu->work['subMenu']->task = array('link' => "{$lang->task->c $lang->my->menu->work['subMenu']->story = array('link' => "$lang->SRCommon|my|work|mode=story", 'alias' => 'story'); $lang->my->menu->work['subMenu']->requirement = array('link' => "$lang->URCommon|my|work|mode=requirement", 'alias' => 'requirement'); $lang->my->menu->work['subMenu']->bug = array('link' => "{$lang->bug->common}|my|work|mode=bug", 'alias' => 'bug'); -$lang->my->menu->work['subMenu']->testcase = array('link' => "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome", 'subModule' => 'testtask', 'alias' => 'testcase'); -$lang->my->menu->work['subMenu']->testtask = array('link' => "{$lang->testtask->common}|my|work|mode=testtask&type=wait", 'alias' => 'testtask'); +$lang->my->menu->work['subMenu']->testcase = array('link' => "{$lang->testcase->common}|my|work|mode=testcase", 'subModule' => 'testtask', 'alias' => 'testcase'); +$lang->my->menu->work['subMenu']->testtask = array('link' => "{$lang->testtask->common}|my|work|mode=testtask", 'alias' => 'testtask'); $lang->my->menu->work['menuOrder'][5] = 'task'; $lang->my->menu->work['menuOrder'][10] = 'story'; @@ -127,10 +127,10 @@ $lang->my->menu->contribute['subMenu']->task = array('link' => "{$lang->t $lang->my->menu->contribute['subMenu']->story = array('link' => "$lang->SRCommon|my|contribute|mode=story", 'alias' => 'story'); $lang->my->menu->contribute['subMenu']->requirement = array('link' => "$lang->URCommon|my|contribute|mode=requirement", 'alias' => 'requirement'); $lang->my->menu->contribute['subMenu']->bug = array('link' => "{$lang->bug->common}|my|contribute|mode=bug", 'alias' => 'bug'); -$lang->my->menu->contribute['subMenu']->testcase = array('link' => "{$lang->testcase->shortCommon}|my|contribute|mode=testcase&type=openedbyme", 'alias' => 'testcase'); -$lang->my->menu->contribute['subMenu']->testtask = array('link' => "{$lang->testtask->common}|my|contribute|mode=testtask&type=done", 'alias' => 'testtask'); -$lang->my->menu->contribute['subMenu']->audit = array('link' => "{$lang->review->common}|my|contribute|mode=audit&type=reviewedbyme", 'subModule' => 'review', 'alias' => 'audit'); -$lang->my->menu->contribute['subMenu']->doc = array('link' => "{$lang->doc->common}|my|contribute|mode=doc&type=openedbyme", 'alias' => 'doc'); +$lang->my->menu->contribute['subMenu']->testcase = array('link' => "{$lang->testcase->shortCommon}|my|contribute|mode=testcase", 'alias' => 'testcase'); +$lang->my->menu->contribute['subMenu']->testtask = array('link' => "{$lang->testtask->common}|my|contribute|mode=testtask", 'alias' => 'testtask'); +$lang->my->menu->contribute['subMenu']->audit = array('link' => "{$lang->review->common}|my|contribute|mode=audit", 'subModule' => 'review', 'alias' => 'audit'); +$lang->my->menu->contribute['subMenu']->doc = array('link' => "{$lang->doc->common}|my|contribute|mode=doc", 'alias' => 'doc'); $lang->my->menu->contribute['menuOrder'][5] = 'task'; $lang->my->menu->contribute['menuOrder'][10] = 'story'; diff --git a/module/my/ui/bug.html.php b/module/my/ui/bug.html.php index 20387ccd75..f16159d2e6 100644 --- a/module/my/ui/bug.html.php +++ b/module/my/ui/bug.html.php @@ -22,7 +22,7 @@ featurebar ( set::current($type), set::linkParams($linkParam), - li(searchToggle()), + li(searchToggle(set::module('bug'))) ); $canBatchEdit = common::hasPriv('bug', 'batchEdit') && $type == 'assignedTo'; diff --git a/module/my/ui/doc.html.php b/module/my/ui/doc.html.php index 84e5b227b0..eb54fbdc9a 100644 --- a/module/my/ui/doc.html.php +++ b/module/my/ui/doc.html.php @@ -18,7 +18,7 @@ featureBar ( set::current($type), set::linkParams("mode=doc&type={key}¶m={$param}"), - li(searchToggle()) + li(searchToggle(set::module('doc'))) ); if($type == 'openedbyme') unset($config->my->doc->dtable->fieldList['addedBy']); diff --git a/module/my/ui/requirement.html.php b/module/my/ui/requirement.html.php index 4648f3e9a8..4a533e2450 100644 --- a/module/my/ui/requirement.html.php +++ b/module/my/ui/requirement.html.php @@ -14,7 +14,7 @@ featureBar ( set::current($type), set::linkParams("mode=requirement&type={key}¶m={$param}"), - li(searchToggle()) + li(searchToggle(set::module('story'))) ); $canBatchEdit = common::hasPriv('story', 'batchEdit'); diff --git a/module/my/ui/story.html.php b/module/my/ui/story.html.php index 6f7f7b050c..20a1450566 100644 --- a/module/my/ui/story.html.php +++ b/module/my/ui/story.html.php @@ -16,7 +16,7 @@ featureBar ( set::current($type), set::linkParams("mode=story&type={key}¶m={$param}"), - li(searchToggle()) + li(searchToggle(set::module('story'))) ); $canBatchEdit = common::hasPriv('story', 'batchEdit'); diff --git a/module/my/ui/task.html.php b/module/my/ui/task.html.php index 898d3a05fc..b650e64473 100644 --- a/module/my/ui/task.html.php +++ b/module/my/ui/task.html.php @@ -18,7 +18,7 @@ featureBar ( set::current($type), set::linkParams("mode={$mode}&type={key}"), - li(searchToggle()) + li(searchToggle(set::module('task'))) ); $canBatchEdit = common::hasPriv('task', 'batchEdit'); diff --git a/module/my/ui/testcase.html.php b/module/my/ui/testcase.html.php index 515c247a77..dfbfa4cd56 100644 --- a/module/my/ui/testcase.html.php +++ b/module/my/ui/testcase.html.php @@ -15,7 +15,7 @@ featureBar ( set::current($type), set::linkParams("mode=testcase&type={key}¶m={$param}"), - li(searchToggle()) + li(searchToggle(set::module('testcase'))) ); $canBatchEdit = common::hasPriv('testcase', 'batchEdit');