diff --git a/module/upgrade/control.php b/module/upgrade/control.php index fbc9e542e5..f69d2f5971 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -161,12 +161,18 @@ class upgrade extends control if(version_compare($openVersion, '15_0', '>=') and version_compare($openVersion, '18_0', '<=') and $systemMode != 'new') { $this->loadModel('setting')->setItem('system.common.global.mode', 'lean'); + /* Lean mode create default program. */ $programID = $this->loadModel('program')->createDefaultProgram(); + /* Set default program config. */ $this->loadModel('setting')->setItem('system.common.global.defaultProgram', $programID); + /* 只有没有关联项目集的产品和项目关联到默认项目集下. */ $this->upgrade->relationDefaultProgram($programID); + + $this->upgrade->classic2Lean($programID); + $selectMode = false; } if(version_compare($openVersion, '18_0', '>')) $selectMode = false; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index ec8cbfe5b5..c7693ee634 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7532,15 +7532,15 @@ class upgradeModel extends model /* * Upgrade from classic mode of 15 version to the lite mode of 18 version. * + * @param int $programID * @access public * @return bool */ - public function classic2Lean() + public function classic2Lean($programID) { /* Set project mode as noExecution. */ $this->loadModel('setting')->setItem('system.common.global.projectMode', 'noExecution'); - $programID = $this->createDefaultProgram(); $this->upgradeInProjectMode($programID); return !dao::isError();