-
+
diff --git a/module/ci/model.php b/module/ci/model.php index a4fcf6d3ae..5d89266128 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -12,11 +12,18 @@ class ciModel extends model /** * Set menu. * + * @param int $repoID * @access public * @return void */ - public function setMenu() + public function setMenu($repoID = 0) { + if($repoID) + { + if(!session_id()) session_start(); + $this->session->set('repoID', $repoID); + session_write_close(); + } common::setMenuVars('devops', $this->session->repoID); } diff --git a/module/mr/control.php b/module/mr/control.php index 8a8c4ce946..82debb62c1 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -1,6 +1,20 @@ session->repoID); */ + if($this->app->getMethodName() != 'browse') $this->loadModel('ci')->setMenu(); + } + /** * Browse mr. * @@ -23,9 +37,10 @@ class mr extends control $repos = $this->loadModel('repo')->getListBySCM('Gitlab'); if(empty($repos)) $this->locate($this->repo->createLink('create')); - if($repoID == 0) $repoID = $this->repo->saveState($repoID, $objectID); - $repo = $this->repo->getRepoByID($repoID); - $this->loadModel('ci')->setMenu(); + $repoID = $this->repo->saveState($repoID, $objectID); + $repo = $this->repo->getRepoByID($repoID); + if($repo->SCM != 'Gitlba') $repo = $repos[0]; + $this->loadModel('ci')->setMenu($repo->id); $projects = $this->mr->getAllGitlabProjects($repoID); $MRList = $this->mr->getList($mode, $param, $orderBy, $pager, empty($projects) ? false : $projects, $repoID); diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php index 2d28e541aa..ae0c53e382 100644 --- a/module/mr/view/browse.html.php +++ b/module/mr/view/browse.html.php @@ -11,7 +11,7 @@