Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/195_mayue_bug#22880' into 'master'

Browse Source 
* Fix bug #22880.

See merge request easycorp/zentaopms!3575
This commit is contained in:
孙广明
2022-05-25 03:28:42 +00:00
parent b9ae95e669 33730f3787
commit 051fd7b74f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+9 -9
View File
@@ -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());