From 63e462a885db6a1493a3809b5db3f0a578acbbaa Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 31 Aug 2020 16:00:28 +0800 Subject: [PATCH] * Finish task #7724. --- module/common/view/header.html.php | 4 ++-- module/custom/model.php | 4 ++-- module/program/model.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 94f4e55e95..44ffdef0a6 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -19,8 +19,8 @@ include 'chosen.html.php';
- loadModel('program')->getSwapper($this->program->getPairs(), $this->session->program, $app->rawModule, $app->rawMethod);?> - loadModel('custom')->getSwapper();?> + loadModel('program')->getSwitcher($this->program->getPairs(), $this->session->program, $app->rawModule, $app->rawMethod);?> + loadModel('custom')->getModeSwitcher();?>
diff --git a/module/custom/model.php b/module/custom/model.php index 44843e9782..41612151ec 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -362,13 +362,13 @@ class customModel extends model } /** - * Get system swapper. + * Get system mode switcher. * @param string $module * @param string $method * @access public * @return array */ - public function getSwapper() + public function getModeSwitcher() { $current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'Scrum' : 'CMMI'; $link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setwaterfall'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'Scrum'); diff --git a/module/program/model.php b/module/program/model.php index 41c5a902b7..9920264bf7 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -441,7 +441,7 @@ class programModel extends model * @access private * @return void */ - public function getSwapper($programs, $programID, $currentModule, $currentMethod, $extra = '') + public function getSwitcher($programs, $programID, $currentModule, $currentMethod, $extra = '') { $this->loadModel('project'); $currentProgramName = '';