Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust 1.5 nav param.

Browse Source
This commit is contained in:
caoyanyi
2023-11-01 15:09:09 +08:00
parent f422dcb1e5
commit c1d30c4479
4 changed files with 101 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+5
View File
@@ -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');
module/mr/ui/diff.html.php
+33 -5
View File
@@ -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)
)
),
)
),
module/mr/ui/link.html.php
+36 -5
View File
@@ -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)
)
),
)
),
module/mr/ui/view.html.php
+27 -4
View File
@@ -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)
)
),
)
),