From 33730f3787d3ac1fee779c43b2ac58809efe1d89 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 25 May 2022 01:56:04 +0000 Subject: [PATCH] * Fix bug #22880. --- module/project/model.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index d2fee3866f..86027b4422 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2482,15 +2482,6 @@ class projectModel extends model global $lang; $project = $this->getByID($objectID); - if(isset($project->model) and $project->model == 'waterfall') - { - global $lang; - $this->loadModel('execution'); - $lang->executionCommon = $lang->project->stage; - - include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php'; - } - $model = 'scrum'; if($project) $model = $project->model; @@ -2507,6 +2498,15 @@ class projectModel extends model $this->loadModel('common')->resetProjectPriv($objectID); if(!$this->common->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false); + if(isset($project->model) and $project->model == 'waterfall') + { + global $lang; + $this->loadModel('execution'); + $lang->executionCommon = $lang->project->stage; + + include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php'; + } + $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod); $this->saveState($objectID, $this->getPairsByProgram());