From 64689cbd17b6722928860bc9baec441b0d0c7a76 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 20 Sep 2022 15:44:33 +0800 Subject: [PATCH] * code for task #69707. --- module/common/lang/menu.php | 30 ++++++++++- module/common/model.php | 2 +- module/common/view/footer.html.php | 3 ++ module/execution/model.php | 2 + module/project/config.php | 3 ++ module/project/control.php | 11 ++++ module/project/model.php | 87 ++++++++++++++++++++++++++++++ 7 files changed, 136 insertions(+), 2 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index afcfa4d37c..174f0b54e2 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -207,7 +207,7 @@ $lang->scrum->menu->index = array('link' => "{$lang->dashboard}|project|inde $lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project|execution|status=all&projectID=%s", 'exclude' => 'execution-testreport', 'subModule' => 'task'); $lang->scrum->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s", 'subModule' => 'doc'); -$lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport,execution', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit'); +$lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit'); $lang->scrum->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo'); $lang->scrum->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s"); $lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease'); @@ -377,6 +377,34 @@ $lang->execution->menu->settings['subMenu']->whitelist = array('link' => "$lang- $lang->execution->dividerMenu = ',story,build,'; +$lang->noSprint = new stdclass(); +$lang->noSprint->menu = new stdclass(); +$lang->noSprint->menu->task = $lang->execution->menu->task; +$lang->noSprint->menu->kanban = $lang->execution->menu->kanban; +$lang->noSprint->menu->burn = $lang->execution->menu->burn; +$lang->noSprint->menu->view = $lang->execution->menu->view; +$lang->noSprint->menu->story = $lang->execution->menu->story; +$lang->noSprint->menu->qa = $lang->scrum->menu->qa; +$lang->noSprint->menu->devops = $lang->scrum->menu->devops; +$lang->noSprint->menu->doc = $lang->scrum->menu->doc; +$lang->noSprint->menu->build = $lang->scrum->menu->build; +$lang->noSprint->menu->dynamic = $lang->scrum->menu->dynamic; +$lang->noSprint->menu->settings = $lang->scrum->menu->settings; + +$lang->noSprint->dividerMenu = ',story,build,'; + +$lang->noSprint->menuOrder[5] = 'task'; +$lang->noSprint->menuOrder[10] = 'kanban'; +$lang->noSprint->menuOrder[15] = 'burn'; +$lang->noSprint->menuOrder[20] = 'view'; +$lang->noSprint->menuOrder[25] = 'story'; +$lang->noSprint->menuOrder[30] = 'qa'; +$lang->noSprint->menuOrder[35] = 'devops'; +$lang->noSprint->menuOrder[40] = 'doc'; +$lang->noSprint->menuOrder[45] = 'build'; +$lang->noSprint->menuOrder[50] = 'dynamic'; +$lang->noSprint->menuOrder[55] = 'settings'; + /* QA menu.*/ $lang->qa->menu = new stdclass(); $lang->qa->menu->index = array('link' => "$lang->dashboard|qa|index"); diff --git a/module/common/model.php b/module/common/model.php index de6e34cf60..60bdd68bd0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -3402,7 +3402,7 @@ EOD; * @param int $objectID * @param array $params */ - static private function setMenuVarsEx($menu, $objectID, $params = array()) + static public function setMenuVarsEx($menu, $objectID, $params = array()) { if(is_array($menu)) { diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 6a5ea6bf22..9e7afaf01a 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -9,6 +9,9 @@ $.initSidebar();
vision != 'lite') echo $this->loadModel('score')->getNotice(); ?>