Merge branch 'sprint/zentaopms240_wangyuting_fixbug' into 'sprint/zentaopms240'

* Fix default program bug. See merge request easycorp/zentaopms!5415
2022-09-20 00:34:36 +00:00
parent 2bd35ee543 fbde75c48b
commit eb0e76c8db
1 changed files with 1 additions and 1 deletions
@@ -710,7 +710,7 @@ class upgrade extends control
            $mergeMode = $this->post->projectType;
            if($mergeMode == 'manually') $this->locate(inlink('mergeProgram'));

-            if($mode == 'lean') $programID = $this->config->defaultProgram;
+            if($mode == 'lean') $programID = $this->config->global->defaultProgram;
            if($mode == 'new')  $programID = $this->loadModel('program')->createDefaultProgram();

            if($mergeMode == 'project')   $this->upgrade->upgradeInProjectMode($programID);