From e6726d5b52eaa91eb197d0d0bb11a8566deca4f4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 16 Sep 2020 08:28:18 +0800 Subject: [PATCH] * Change template to model. --- framework/router.class.php | 6 +++--- module/common/model.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/router.class.php b/framework/router.class.php index 6f64d7d511..90aac12d30 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -150,7 +150,7 @@ class router extends baseRouter $productIndex = $storyIndex = $hourIndex = $planIndex = $URAndSR = 0; $projectIndex = empty($this->config->isINT) ? 0 : 1; - if($this->session->program) $template = $this->dbh->query('SELECT template FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch(); + if($this->session->program) $model = $this->dbh->query('SELECT model FROM' . TABLE_PROJECT . "WHERE id = {$this->session->program}")->fetch(); foreach($commonSettings as $setting) { @@ -161,7 +161,7 @@ class router extends baseRouter if($setting->key == 'URSRName') { - if(isset($template->template) && $setting->section == $template->template) + if(isset($model->model) && $setting->section == $model->model) { $URSRName = json_decode($setting->value, true); if(isset($URSRName['URCommon'][$this->clientLang])) $lang->URCommon = $URSRName['URCommon'][$this->clientLang]; @@ -170,7 +170,7 @@ class router extends baseRouter } } - if(isset($template->template) && $template->template == 'waterfall') + if(isset($model->model) && $model->model == 'waterfall') { $projectIndex = 2; $planIndex = 1; diff --git a/module/common/model.php b/module/common/model.php index e02288a216..5ae2584c8e 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2200,7 +2200,7 @@ EOD; } /** - * Get program main menu by template. + * Get program main menu by model. * * @param string $moduleName * @static @@ -2213,13 +2213,13 @@ EOD; $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->program}'")->fetch(); if(empty($program)) return; - if($program->template == 'scrum') + if($program->model == 'scrum') { $lang->menuOrder = $lang->scrum->menuOrder; return $lang->menu; } - if($program->template == 'waterfall') + if($program->model == 'waterfall') { $lang->release->menu = new stdclass(); $lang->menugroup->release = ''; @@ -2231,7 +2231,7 @@ EOD; } /** - * Get program module menu by template. + * Get program module menu by model. * * @param varchar $moduleName * @static @@ -2243,7 +2243,7 @@ EOD; global $app, $lang, $dbh; $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->program}'")->fetch(); if(empty($program)) return; - if($program->template == 'waterfall') + if($program->model == 'waterfall') { $lang->product->menu = $lang->waterfallproduct->menu; $lang->productplan->menu = $lang->waterfallproduct->menu;