From e0edb0bf916f9d1bc7fa24994ffb223aa2e3dffe Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 06:12:11 +0000
Subject: [PATCH 1/6] * Fix bug #28147.

---
 module/custom/view/mode.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
     <table class='table table-form'>
       <tr>
         <th class='text-top w-120px'><?php echo $lang->custom->mode;?></th>
-        <td class='w-200px'>
+        <td class='w-300px'>
           <p>
             <label class="radio-inline"><input type="radio" name="mode" value="lean" <?php echo $mode == 'lean'? "checked='checked'" : '';?> id="modelean"><?php echo $lang->upgrade->to18Mode['lean'];?></label>
             <label class="radio-inline"><input type="radio" name="mode" value="new" <?php echo $mode == 'new'? "checked='checked'" : '';?> id="modenew"><?php echo $lang->upgrade->to18Mode['new'];?></label>

From 53cf43823d8754df68bf074dd5b91ce9cfea7f6f Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 07:56:40 +0000
Subject: [PATCH 2/6] * Fix bug #28193.

---
 module/upgrade/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 5abfda3cf6..7535cd33da 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7733,6 +7733,8 @@ class upgradeModel extends model
     {
         $this->dao->update(TABLE_PRODUCT)->set('program')->eq($programID)->where('program')->eq(0)->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("path = CONCAT(',{$programID}', path)")->set('grade = grade + 1')->where('type')->eq('project')->andWhere('parent')->eq(0)->andWhere('grade')->eq(1)->exec();
 
         return !dao::isError();

From 64b22cb464b112bd9c43b16e4eec7ad35c5860d9 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 08:04:53 +0000
Subject: [PATCH 3/6] * Fix bug.

---
 module/upgrade/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
             }

From 9c6798f85d674dc4b02631633c53639992e77ffd Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 08:15:53 +0000
Subject: [PATCH 4/6] * Fix bug #28213.

---
 module/product/view/project.html.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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 @@
           <?php endif;?>
           <td class='text-left'>
             <?php
-            if($config->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);
             ?>
           </td>
           <td class='padding-right'>

From 3a6bca52e896911c7b2105d10b2974c82b9433e0 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 08:21:43 +0000
Subject: [PATCH 5/6] * Fix bug #27928.

---
 module/upgrade/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 7535cd33da..3589973013 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7735,7 +7735,7 @@ class upgradeModel extends model
 
         $this->dao->update(TABLE_MODULE)->set('root')->eq($programID)->where('type')->eq('line')->andWhere('root')->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_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();
     }

From e438c9f3ab21d3c02d9ff94c9cd3b5cba7788893 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 29 Sep 2022 09:17:45 +0000
Subject: [PATCH 6/6] * Fix bug # 28182.

---
 module/upgrade/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 7535cd33da..d75122dc9d 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();