From 76c04621190673c6fd27ef5fb5efd085b7d0b5c8 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 24 Apr 2022 01:53:07 +0000
Subject: [PATCH 1/4] * Fix bug #21439.

---
 module/execution/view/treestory.html.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php
index 8aa91ed49c..719c39b78d 100644
--- a/module/execution/view/treestory.html.php
+++ b/module/execution/view/treestory.html.php
@@ -199,6 +199,7 @@
   <div class="detail-content">
     <table class="table table-data">
       <tbody>
+        <?php if($this->config->vision != 'lite'):?>
         <?php if(!empty($fromBug)):?>
         <tr class='text-top'>
           <th class='thWidth'><?php echo $lang->story->legendFromBug;?></th>
@@ -243,6 +244,7 @@
             <?php endif;?>
           </td>
         </tr>
+        <?php endif;?>
         <tr class='text-top'>
           <th><?php echo $lang->story->legendLinkStories;?></th>
           <td class='pd-0'>

From bc1a55d155d55a010f49680a030c7819a456dacb Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 24 Apr 2022 13:39:19 +0800
Subject: [PATCH 2/4] * Fix bug #14850.

---
 extension/lite/task/ext/view/batchcreate.html.php | 2 +-
 module/execution/css/all.css                      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php
index 8907bf1f32..6f432d2625 100644
--- a/extension/lite/task/ext/view/batchcreate.html.php
+++ b/extension/lite/task/ext/view/batchcreate.html.php
@@ -135,7 +135,7 @@
             </td>
             <td <?php echo zget($visibleFields, 'region', "class='hidden'")?> style='overflow:visible'><?php echo html::select("region[$i]", $regionList, isset($regionID) ? $regionID : '', "class='form-control chosen' onchange='loadLaneGroup(this.value, $i)'");?></td>
             <td <?php echo zget($visibleFields, 'lane', "class='hidden'")?> style='overflow:visible'><?php echo html::select("lane[$i]", $lanes, '', "class='form-control chosen'");?></td>
-            <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
+            <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, "class='form-control chosen'");?></td>
             <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
             <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>
             <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>>
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index c1ac7084d4..49211f1ddb 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -26,3 +26,5 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
 td.flex span.project-type-label {min-width: 40px;}
 
 .label-children {min-width:22px !important;}
+.c-name > a, .table-children .text-left > a {padding-left: 5px;}
+.has-child > span {margin-right: 5px;}

From cbec52510243bc4d53932909cc82a23c45063740 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 24 Apr 2022 13:55:08 +0800
Subject: [PATCH 3/4] * Fix bug #17602.

---
 module/programplan/view/create.html.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 39ac93c799..c95a562a64 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -22,6 +22,7 @@
       echo "<span class='text'>{$title}</span>";
       ?>
     </span>
+    <?php if($productList):?>
     <div class='btn-group'>
       <?php $viewName = $productID != 0 ? zget($productList,$productID) : current($productList);?>
       <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
@@ -34,6 +35,7 @@
         ?>
       </ul>
     </div>
+    <?php endif;?>
   </div>
 </div>
 <?php $hideAttribute = $planID == 0 ? '' : ' hidden'?>

From c72bd0a1df1416dd9171656852c789cf10d31dda Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 24 Apr 2022 14:27:19 +0800
Subject: [PATCH 4/4] * Fix bug #18209.

---
 module/stage/model.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/stage/model.php b/module/stage/model.php
index 9d4bd1e366..b25a0e7304 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -26,7 +26,11 @@ class stageModel extends model
             ->add('createdDate', helper::today())
             ->get();
 
-        $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
+        $this->dao->insert(TABLE_STAGE)
+            ->data($stage)
+            ->autoCheck()
+            ->checkIF($stage->percent != '', 'percent', 'float')
+            ->exec();
 
         if(!dao::isError()) return $this->dao->lastInsertID();
         return false;
@@ -54,7 +58,7 @@ class stageModel extends model
             $stage->createdBy   = $this->app->user->account;
             $stage->createdDate = helper::today();
 
-            $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec();
+            $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec();
 
             $stageID = $this->dao->lastInsertID();
             $this->action->create('stage', $stageID, 'Opened');
@@ -79,7 +83,7 @@ class stageModel extends model
             ->add('editedDate', helper::today())
             ->get();
 
-        $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->where('id')->eq((int)$stageID)->exec();
+        $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID)->exec();
 
         if(!dao::isError()) return common::createChanges($oldStage, $stage);
         return false;