From cae62af3d049c3310e0f57df262887911fef3092 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 21 Sep 2020 15:28:34 +0800 Subject: [PATCH] * Fix menu. --- module/common/model.php | 15 ++++++--------- module/program/control.php | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 21c536697e..44ec0dd2c0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2188,14 +2188,11 @@ EOD; } if($group == 'program') { - if($moduleName == 'program') - { - $lang->menu = $lang->program->menu; - } - else - { - $lang->menu = self::getProgramMainMenu($moduleName); - } + $lang->menu = $lang->program->menu; + } + if($group == 'project') + { + $lang->menu = self::getProgramMainMenu($moduleName); } } @@ -2245,7 +2242,7 @@ EOD; public static function getProgramMainMenu($moduleName) { global $app, $lang, $dbh; - $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->program}'")->fetch(); + $program = $dbh->query("SELECT * FROM " . TABLE_PROGRAM . " WHERE `id` = '{$app->session->program}'")->fetch(); if(empty($program)) return; if($program->model == 'scrum') diff --git a/module/program/control.php b/module/program/control.php index 02a953da89..c8805fa236 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -18,7 +18,7 @@ class program extends control */ public function index($programID = 0) { - $this->lang->navGroup->program = 'program'; + $this->lang->navGroup->program = 'project'; if(!$programID) $programID = $this->session->PRJ; $this->session->set('program', $programID);