diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index 042759bc8b..e31bc07b67 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -24,7 +24,7 @@ -
custom->mode;?> +

diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 2037c8943c..f69802d26a 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -69,14 +69,7 @@

systemMode == 'new') - { - echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name); - } - else - { - echo html::a($this->createLink('execution', 'task', 'project=' . $project->id), $project->name); - } + echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name); ?> diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 0be4d9bd72..40620f9699 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -171,7 +171,7 @@ class upgrade extends control $this->upgrade->upgradeInProjectMode($programID, $systemMode); - $this->loadModel('custom')->disableFeaturesByMode($mode); + $this->loadModel('custom')->disableFeaturesByMode('lean'); $selectMode = false; } diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 5abfda3cf6..2c5a88444d 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7568,7 +7568,7 @@ class upgradeModel extends model $project->acl = $sprint->acl == 'open' ? 'open' : 'private'; if($fromMode == 'classic') $project->multiple = '0'; - $this->dao->insert(TABLE_PROJECT)->data($project)->check('name', 'unique', "type='project' AND parent=$programID AND deleted='0'")->exec(); + $this->dao->insert(TABLE_PROJECT)->data($project)->exec(); if(dao::isError()) return false; $projectID = $this->dao->lastInsertId(); @@ -7733,7 +7733,9 @@ class upgradeModel extends model { $this->dao->update(TABLE_PRODUCT)->set('program')->eq($programID)->where('program')->eq(0)->exec(); - $this->dao->update(TABLE_PROJECT)->set("path = CONCAT(',{$programID}', path)")->set('grade = grade + 1')->where('type')->eq('project')->andWhere('parent')->eq(0)->andWhere('grade')->eq(1)->exec(); + $this->dao->update(TABLE_MODULE)->set('root')->eq($programID)->where('type')->eq('line')->andWhere('root')->eq('0')->exec(); + + $this->dao->update(TABLE_PROJECT)->set('parent')->eq($programID)->set("path = CONCAT(',{$programID}', path)")->set('grade = grade + 1')->where('type')->eq('project')->andWhere('parent')->eq(0)->andWhere('grade')->eq(1)->exec(); return !dao::isError(); }