From c1d30c44796bb1a25aeeaa23b389eaacc0e50b4e Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 1 Nov 2023 15:09:09 +0800 Subject: [PATCH] * Adjust 1.5 nav param. --- module/mr/control.php | 5 +++++ module/mr/ui/diff.html.php | 38 ++++++++++++++++++++++++++++++----- module/mr/ui/link.html.php | 41 +++++++++++++++++++++++++++++++++----- module/mr/ui/view.html.php | 31 ++++++++++++++++++++++++---- 4 files changed, 101 insertions(+), 14 deletions(-) diff --git a/module/mr/control.php b/module/mr/control.php index fc955bfb70..8f7de80d33 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -13,6 +13,8 @@ class mr extends control /* This is essential when changing tab(menu) from gitlab to repo. */ /* Optional: common::setMenuVars('devops', $this->session->repoID); */ if($this->app->getMethodName() != 'browse') $this->loadModel('ci')->setMenu(); + $this->view->objectID = $this->app->tab == 'execution' ? $this->session->execution : 0; + if($this->app->tab == 'execution') $this->view->executionID = $this->session->execution; } /** @@ -108,6 +110,7 @@ class mr extends control } } + if($this->app->tab == 'execution') $this->view->executionID = $objectID; $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse; $this->view->MRList = $MRList; $this->view->projects = $projects; @@ -413,6 +416,7 @@ class mr extends control $this->view->MR = $MR; $this->view->rawMR = isset($rawMR) ? $rawMR : false; $this->view->product = $product; + $this->view->repoID = $MR->repoID; $this->view->stories = $this->mr->getLinkList($MR->id, $product->id, 'story'); $this->view->bugs = $this->mr->getLinkList($MR->id, $product->id, 'bug'); $this->view->tasks = $this->mr->getLinkList($MR->id, $product->id, 'task'); @@ -660,6 +664,7 @@ class mr extends control $this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->link; $this->view->MR = $MR; + $this->view->repoID = $MR->repoID; $this->view->canBeChanged = true; $this->view->modulePairs = $this->loadModel('tree')->getOptionMenu($product->id, 'story'); $this->view->users = $this->loadModel('user')->getPairs('noletter'); diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index b15acacd42..741cdd5589 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -68,27 +68,55 @@ panel li ( setClass('nav-item'), - a($lang->mr->view, set::href(inlink('view', "MRID={$MR->id}"))) + a + ( + $lang->mr->view, + set::href(inlink('view', "MRID={$MR->id}")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item'), - a($lang->mr->viewDiff, setClass('active')) + a + ( + $lang->mr->viewDiff, + setClass('active'), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item story'), - a(icon($lang->icons['story']), $lang->productplan->linkedStories, set::href(inlink('link', "MRID={$MR->id}&type=story"))) + a + ( + icon($lang->icons['story']), + $lang->productplan->linkedStories, + set::href(inlink('link', "MRID={$MR->id}&type=story")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item bug'), - a(icon($lang->icons['bug']), $lang->productplan->linkedBugs, set::href(inlink('link', "MRID={$MR->id}&type=bug"))) + a + ( + icon($lang->icons['bug']), + $lang->productplan->linkedBugs, + set::href(inlink('link', "MRID={$MR->id}&type=bug")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item task'), - a(icon('todo'), $lang->mr->linkedTasks, set::href(inlink('link', "MRID={$MR->id}&type=task"))) + a + ( + icon('todo'), + $lang->mr->linkedTasks, + set::href(inlink('link', "MRID={$MR->id}&type=task")), + set('data-app', $app->tab) + ) ), ) ), diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php index d1ed9f0935..936e5c185c 100644 --- a/module/mr/ui/link.html.php +++ b/module/mr/ui/link.html.php @@ -128,27 +128,58 @@ panel li ( setClass('nav-item' . ($type == 'view' ? ' active' : '')), - a($lang->mr->view, set::href(inlink('view', "MRID={$MR->id}"))) + a + ( + $lang->mr->view, + set::href(inlink('view', "MRID={$MR->id}")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item' . ($type == 'diff' ? ' active' : '')), - a($lang->mr->viewDiff, set::href(inlink('diff', "MRID={$MR->id}"))) + a + ( + $lang->mr->viewDiff, + set::href(inlink('diff', "MRID={$MR->id}")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item story' . ($type == 'story' ? ' active' : '')), - a(icon($lang->icons['story']), $lang->productplan->linkedStories, set::href('#mr-story'), set('data-toggle', 'tab')) + a + ( + icon($lang->icons['story']), + $lang->productplan->linkedStories, + set::href('#mr-story'), + set('data-toggle', 'tab'), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item bug' . ($type == 'bug' ? ' active' : '')), - a(icon($lang->icons['bug']), $lang->productplan->linkedBugs, set::href('#mr-bug'), set('data-toggle', 'tab')) + a + ( + icon($lang->icons['bug']), + $lang->productplan->linkedBugs, + set::href('#mr-bug'), + set('data-toggle', 'tab'), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item task' . ($type == 'task' ? ' active' : '')), - a(icon('todo'), $lang->mr->linkedTasks, set::href('#mr-task'), set('data-toggle', 'tab')) + a + ( + icon('todo'), + $lang->mr->linkedTasks, + set::href('#mr-task'), + set('data-toggle', 'tab'), + set('data-app', $app->tab) + ) ), ) ), diff --git a/module/mr/ui/view.html.php b/module/mr/ui/view.html.php index d44c0d6c43..0dd03e0acc 100644 --- a/module/mr/ui/view.html.php +++ b/module/mr/ui/view.html.php @@ -147,22 +147,45 @@ panel li ( setClass('nav-item'), - a($lang->mr->viewDiff, set::href(inlink('diff', "MRID={$MR->id}"))) + a + ( + $lang->mr->viewDiff, + set::href(inlink('diff', "MRID={$MR->id}")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item'), - a(icon($lang->icons['story']), $lang->productplan->linkedStories, set::href(inlink('link', "MRID={$MR->id}&type=story"))) + a + ( + icon($lang->icons['story']), + $lang->productplan->linkedStories, + set::href(inlink('link', "MRID={$MR->id}&type=story")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item'), - a(icon($lang->icons['bug']), $lang->productplan->linkedBugs, set::href(inlink('link', "MRID={$MR->id}&type=bug"))) + a + ( + icon($lang->icons['bug']), + $lang->productplan->linkedBugs, + set::href(inlink('link', "MRID={$MR->id}&type=bug")), + set('data-app', $app->tab) + ) ), li ( setClass('nav-item'), - a(icon('todo'), $lang->mr->linkedTasks, set::href(inlink('link', "MRID={$MR->id}&type=task"))) + a + ( + icon('todo'), + $lang->mr->linkedTasks, + set::href(inlink('link', "MRID={$MR->id}&type=task")), + set('data-app', $app->tab) + ) ), ) ),