From ae06366f2ac39dbdaae06f0ec8250072dfeec017 Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Fri, 15 Jul 2022 05:09:12 +0000 Subject: [PATCH] * Fix bug #25283. --- module/ci/model.php | 8 +++++++- module/repo/model.php | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/module/ci/model.php b/module/ci/model.php index 2f5bf854b0..96e962551e 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -26,7 +26,13 @@ class ciModel extends model } common::setMenuVars('devops', $this->session->repoID); - $this->lang->switcherMenu = $this->loadModel('repo')->getSwitcher($this->session->repoID); + if($this->session->repoID) + { + $repo = $this->loadModel('repo')->getRepoByID($repoID); + if($repo->SCM != 'Gitlab') unset($this->lang->devops->menu->mr); + + $this->lang->switcherMenu = $this->loadModel('repo')->getSwitcher($this->session->repoID); + } } /** diff --git a/module/repo/model.php b/module/repo/model.php index 99fe05dee8..f8ffb801c3 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -38,6 +38,9 @@ class repoModel extends model if(empty($repoID)) $repoID = $this->session->repoID ? $this->session->repoID : key($repos); if(!isset($repos[$repoID])) $repoID = key($repos); + /* Init switcher menu. */ + $this->lang->switcherMenu = ''; + /* Check the privilege. */ if($repoID) {