From 6d45dea34524f2398a426311a84782c052b5acd3 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:46:02 +0800
Subject: [PATCH 01/28] * fix padding of project name in table list.

---
 module/project/view/browsebylist.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index 461051618b..89893e35e9 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -17,9 +17,11 @@
 #projectTableList .project-name {position: relative; display: flex; align-items: center;}
 #projectTableList .project-name > span,
 #projectTableList .project-name > span {flex: none;}
-#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px); padding: 0 5px;}
+#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
 #projectTableList .project-name.has-prefix > a,
-#projectTableList .project-name.has-surfix > a {max-width: calc(100% - 100px);}
+#projectTableList .project-name.has-suffix > a {max-width: calc(100% - 100px);}
+#projectTableList .project-name.has-prefix > a {padding-left: 5px;}
+#projectTableList .project-name.has-suffix > a {padding-right: 5px;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if($this->config->systemMode == 'new'):?>

From aecf12e083d357e02943f71f1c1418fb4843ae57 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:51:43 +0800
Subject: [PATCH 02/28] * Finish task #42415.

---
 module/task/lang/de.php                  | 1 +
 module/task/lang/en.php                  | 1 +
 module/task/lang/fr.php                  | 1 +
 module/task/lang/vi.php                  | 1 +
 module/task/lang/zh-cn.php               | 1 +
 module/task/model.php                    | 8 +++++++-
 module/task/view/editestimate.html.php   | 2 +-
 module/task/view/recordestimate.html.php | 2 +-
 8 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 0abf07334c..6ba9d23cb6 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -223,6 +223,7 @@ $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';
 $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
 $lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"';
 $lang->task->error->alreadyConsumed   = 'The currently selected parent task has been consumed.';
+$lang->task->error->date              = 'The date should be >= today.';
 
 /* Report. */
 $lang->task->report = new stdclass();
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index f18814599c..b76b1ec6b9 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -226,6 +226,7 @@ $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';
 $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
 $lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"';
 $lang->task->error->alreadyConsumed   = 'The currently selected parent task has been consumed.';
+$lang->task->error->date              = 'The date should be >= today.';
 
 /* Report. */
 $lang->task->report = new stdclass();
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index bbd34ff83d..9e5cfbf417 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -223,6 +223,7 @@ $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';
 $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
 $lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"';
 $lang->task->error->alreadyConsumed   = 'The currently selected parent task has been consumed.';
+$lang->task->error->date              = 'The date should be >= today.';
 
 /* Report. */
 $lang->task->report = new stdclass();
diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php
index e6629cd6f3..60ea78c65a 100644
--- a/module/task/lang/vi.php
+++ b/module/task/lang/vi.php
@@ -223,6 +223,7 @@ $lang->task->error->realStartedEmpty  = '"Real Started" should not be empty.';
 $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
 $lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"';
 $lang->task->error->alreadyConsumed   = 'The currently selected parent task has been consumed.';
+$lang->task->error->date              = 'The date should be >= today.';
 
 /* Report. */
 $lang->task->report = new stdclass();
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 4030feb93d..a7b373aab1 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -226,6 +226,7 @@ $lang->task->error->realStartedEmpty  = '实际开始不能为空';
 $lang->task->error->finishedDateEmpty = '实际完成不能为空';
 $lang->task->error->finishedDateSmall = '实际完成不能小于实际开始';
 $lang->task->error->alreadyConsumed   = '当前选中的父任务已有消耗。';
+$lang->task->error->date              = '日期不能大于今天';
 
 /* Report. */
 $lang->task->report         = new stdclass();
diff --git a/module/task/model.php b/module/task/model.php
index d6c8f89b81..62954e6b6c 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1474,12 +1474,14 @@ class taskModel extends model
     public function recordEstimate($taskID)
     {
         $record = fixer::input('post')->get();
+        $today  = helper::today();
 
         /* Fix bug#3036. */
         foreach($record->consumed as $id => $item) $record->consumed[$id] = trim($item);
         foreach($record->left     as $id => $item) $record->left[$id]     = trim($item);
         foreach($record->consumed as $id => $item) if(!is_numeric($item) and !empty($item)) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber;
         foreach($record->left     as $id => $item) if(!is_numeric($item) and !empty($item)) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber;
+        foreach($record->dates    as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date;
         if(dao::isError()) return false;
 
         $estimates    = array();
@@ -2340,7 +2342,11 @@ class taskModel extends model
     {
         $oldEstimate = $this->getEstimateById($estimateID);
         $estimate    = fixer::input('post')->get();
-        $task        = $this->getById($oldEstimate->task);
+        $today       = helper::today();
+
+        if($estimate->date > $today) return dao::$errors[] = $this->lang->task->error->date;
+
+        $task = $this->getById($oldEstimate->task);
         $this->dao->update(TABLE_TASKESTIMATE)->data($estimate)
             ->autoCheck()
             ->check('consumed', 'notempty')
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index d1e04c210a..a63ae4cf63 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -23,7 +23,7 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->task->date;?></th>
-          <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date" readonly');?></td>
+          <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td>
           <td></td>
         </tr>  
         <tr>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 884844530e..9d5ad61e44 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -86,7 +86,7 @@
           <?php for($i = 1; $i <= 3; $i++):?>
           <tr class="text-center">
             <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
-            <td><?php echo html::input("dates[$i]", helper::today(), "class='form-control text-center form-date' readonly");?></td>
+            <td><?php echo html::input("dates[$i]", helper::today(), "class='form-control text-center form-date'");?></td>
             <td><?php echo html::input("consumed[$i]", '', "class='form-control text-center'");?></td>
             <td><?php echo html::input("left[$i]", '', "class='form-control text-center left'");?></td>
             <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>

From d3ffc97d41dde93860755661e6f22912852023c9 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:52:53 +0800
Subject: [PATCH 03/28] * Fix bug#14927 and Finish task#42423,42420,42419

---
 module/program/js/common.js         |  7 +++++++
 module/program/view/create.html.php |  2 +-
 module/project/js/common.js         |  3 ++-
 module/testcase/model.php           | 13 +++++++------
 module/testtask/js/common.js        |  1 +
 module/todo/lang/de.php             |  4 ++--
 module/todo/lang/en.php             |  4 ++--
 module/todo/lang/fr.php             |  4 ++--
 module/todo/lang/vi.php             |  4 ++--
 module/todo/lang/zh-cn.php          |  4 ++--
 module/todo/model.php               |  6 +++---
 11 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/module/program/js/common.js b/module/program/js/common.js
index f34e41c406..ee200bbefa 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -75,6 +75,13 @@ function computeWorkDays(currentID)
     {
         beginDate = $('#begin').val();
         endDate   = $('#end').val();
+        
+        var begin = new Date(beginDate.replace(/-/g,"/"));
+        var end   = new Date(endDate.replace(/-/g,"/"));
+        var time  = end.getTime() - begin.getTime();
+        var days  = parseInt(time / (1000 * 60 * 60 * 24)) + 1;
+        if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked', false);
+        if(endDate == longTime) $("#delta999").prop('checked', true);
     }
 
     if(beginDate && endDate)
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index 6d993796a0..c3f59398a1 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -87,7 +87,7 @@
           <th><?php echo $lang->project->dateRange;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('begin', date('Y-m-d'), "class='form-control form-date' placeholder='" . $lang->project->begin . "' required");?>
+              <?php echo html::input('begin', date('Y-m-d'), "class='form-control form-date' onchange='computeWorkDays();' placeholder='" . $lang->project->begin . "' required");?>
               <span class='input-group-addon'><?php echo $lang->project->to;?></span>
               <?php echo html::input('end', '', "class='form-control form-date' placeholder='" . $lang->project->end . "' required");?>
             </div>
diff --git a/module/project/js/common.js b/module/project/js/common.js
index 1f7db86b14..5965156fdd 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -80,7 +80,8 @@ function computeWorkDays(currentID)
         var end   = new Date(endDate.replace(/-/g,"/"));
         var time  = end.getTime() - begin.getTime();
         var days  = parseInt(time / (1000 * 60 * 60 * 24)) + 1;
-        if(days != $("input:radio[name='delta']:checked").val() && $("input:radio[name='delta']:checked").val() != 999) $("input:radio[name='delta']:checked").attr('checked',false);
+        if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked', false);
+        if(endDate == longTime) $("#delta999").prop('checked', true);
     }
 
     if(beginDate && endDate)
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 332a6644d0..9fbf37c07b 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -568,7 +568,8 @@ class testcaseModel extends model
             ->andWhere('deleted')->eq(0)
             ->beginIF($auto != 'skip' and $auto != 'unit')->andWhere('auto')->ne('unit')->fi()
             ->beginIF($auto == 'unit')->andWhere('auto')->eq('unit')->fi()
-            ->orderBy($orderBy)->page($pager)->fetchAll('id');
+            ->orderBy($orderBy)->page($pager)
+            ->fetchAll('id');
     }
 
     /**
@@ -589,7 +590,7 @@ class testcaseModel extends model
     {
         $modules = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0';
 
-        $cases = $this->dao->select('t1.*, t2.title as storyTitlen')->from(TABLE_CASE)->alias('t1')
+        $cases = $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
             ->beginIF($productID)->where('t1.product')->eq((int) $productID)->fi()
             ->beginIF($productID == 0)->where('t1.product')->in($this->app->user->view->products)->fi()
@@ -600,7 +601,8 @@ class testcaseModel extends model
             ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
             ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
             ->andWhere('t1.deleted')->eq('0')
-            ->orderBy($orderBy)->page($pager)->fetchAll('id');
+            ->orderBy($orderBy)->page($pager)
+            ->fetchAll('id');
         return $this->appendData($cases);
     }
 
@@ -1006,10 +1008,9 @@ class testcaseModel extends model
         $actions = array();
         $this->loadModel('action');
 
+        $oldCases = $this->getByList($caseIdList);
         foreach($caseIdList as $caseID)
         {
-            $oldCase = $this->getById($caseID);
-
             $case = new stdClass();
             $case->lastEditedBy   = $this->app->user->account;
             $case->lastEditedDate = $now;
@@ -1017,7 +1018,7 @@ class testcaseModel extends model
 
             $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec();
             $actionID = $this->action->create('case', $caseID, 'Edited', '', ucfirst($result));
-            $changes  = common::createChanges($oldCase, $case);
+            $changes  = common::createChanges($oldCases[$caseID], $case);
             $this->action->logHistory($actionID, $changes);
         }
     }
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 40be674e7a..e4b41e46da 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -85,6 +85,7 @@ function loadExecutionRelated(executionID)
  * Load execution builds.
  *
  * @param  int $executionID
+ * @param  int $selected
  * @access public
  * @return void
  */
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 12930f3d08..4fc9836de8 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -69,8 +69,8 @@ $lang->todo->closedBy     = 'ClosedBy';
 $lang->todo->closedDate   = 'ClosedDate';
 $lang->todo->deadline     = 'Fällig';
 
-$lang->todo->cycleDayTxt   = 'Interval days';
-$lang->todo->beforeDaysTxt = 'Days in advance';
+$lang->todo->cycleDaysLabel  = 'Interval days';
+$lang->todo->beforeDaysLabel = 'Days in advance';
 
 $lang->todo->every        = 'Jeden';
 $lang->todo->specify      = 'ernennen';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 99dfe7a03f..b12f55bd9d 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -70,8 +70,8 @@ $lang->todo->closedDate   = 'ClosedDate';
 $lang->todo->deadline     = 'Expiration';
 $lang->todo->deleted      = 'Deleted';
 
-$lang->todo->cycleDayTxt   = 'Interval days';
-$lang->todo->beforeDaysTxt = 'Days in advance';
+$lang->todo->cycleDaysLabel  = 'Interval days';
+$lang->todo->beforeDaysLabel = 'Days in advance';
 
 $lang->todo->every        = 'Every';
 $lang->todo->specify      = 'Specify';
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 9e8eafc6fc..9154e1d034 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -69,8 +69,8 @@ $lang->todo->closedBy     = 'ClosedBy';
 $lang->todo->closedDate   = 'ClosedDate';
 $lang->todo->deadline     = 'Expiration';
 
-$lang->todo->cycleDayTxt   = 'Interval days';
-$lang->todo->beforeDaysTxt = 'Days in advance';
+$lang->todo->cycleDaysLabel  = 'Interval days';
+$lang->todo->beforeDaysLabel = 'Days in advance';
 
 $lang->todo->every        = 'Chaque';
 $lang->todo->specify      = 'Désigner';
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 5e4ae560b0..afbb9a22f3 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -69,8 +69,8 @@ $lang->todo->closedBy     = 'Người đóng';
 $lang->todo->closedDate   = 'Ngày đóng';
 $lang->todo->deadline     = 'Quá hạn';
 
-$lang->todo->cycleDayTxt   = 'Interval days';
-$lang->todo->beforeDaysTxt = 'Days in advance';
+$lang->todo->cycleDaysLabel  = 'Interval days';
+$lang->todo->beforeDaysLabel = 'Days in advance';
 
 $lang->todo->every        = 'Mọi';
 $lang->todo->specify      = 'bổ nhiệm';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 7eae292cc4..d0fdb00809 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -70,8 +70,8 @@ $lang->todo->closedDate   = '关闭时间';
 $lang->todo->deadline     = '过期时间';
 $lang->todo->deleted      = '已删除';
 
-$lang->todo->cycleDayTxt   = '间隔天数';
-$lang->todo->beforeDaysTxt = '提前天数';
+$lang->todo->cycleDaysLabel  = '间隔天数';
+$lang->todo->beforeDaysLabel = '提前天数';
 
 $lang->todo->every        = '间隔';
 $lang->todo->specify      = '指定';
diff --git a/module/todo/model.php b/module/todo/model.php
index 94ef901090..cb5f8782d3 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -77,12 +77,12 @@ class todoModel extends model
                 unset($todo->config['month']);
                 if(!$todo->config['day'])
                 {
-                    dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDayTxt);
+                    dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel);
                     return false;
                 }
                 if(!validater::checkInt($todo->config['day']))
                 {
-                    dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDayTxt);
+                    dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel);
                     return false;
                 }
             }
@@ -101,7 +101,7 @@ class todoModel extends model
 
             if($todo->config['beforeDays'] and !validater::checkInt($todo->config['beforeDays']))
             {
-                dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysTxt);
+                dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysLabel);
                 return false;
             }
             $todo->config['beforeDays'] = (int)$todo->config['beforeDays'];

From cef4ce5e1cc818cc2f307f5724e017b67ca9af94 Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:57:19 +0800
Subject: [PATCH 04/28] * Add $lang->mr to common module.

---
 module/common/lang/common.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 34e2a433c4..d74e9b3b3c 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -39,6 +39,7 @@ $lang->report      = new stdclass();
 $lang->repo        = new stdclass();
 $lang->jenkins     = new stdclass();
 $lang->gitlab      = new stdclass();
+$lang->mr          = new stdclass();
 $lang->compile     = new stdclass();
 $lang->job         = new stdclass();
 $lang->svn         = new stdclass();

From a4be8f518abdedbdc7c82dc995ec4a40d052b914 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:58:22 +0800
Subject: [PATCH 05/28] * Fix bug #14996.

---
 module/group/lang/resource.php |  3 ++-
 module/mr/lang/en.php          | 18 ++++++++++--------
 module/mr/lang/zh-cn.php       |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 6c1c414380..54b6f737ab 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1171,7 +1171,8 @@ $lang->mr->methodOrder[10] = 'create';
 $lang->mr->methodOrder[15] = 'browse';
 $lang->mr->methodOrder[20] = 'edit';
 $lang->mr->methodOrder[25] = 'delete';
-$lang->mr->methodOrder[35] = 'settings';
+$lang->mr->methodOrder[35] = 'view';
+$lang->mr->methodOrder[45] = 'accept';
 
 /* Git. */
 $lang->resource->git = new stdclass();
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index d2b1e12aaa..b45a6dba32 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -1,15 +1,17 @@
 <?php
+$lang->mr = new stdclass;
 $lang->mr->common       = "Merge Request";
-$lang->mr->create       = "create";
-$lang->mr->browse       = "browse";
-$lang->mr->list         = "list";
-$lang->mr->edit         = "edit";
-$lang->mr->delete       = "delete";
-$lang->mr->view         = "view";
+$lang->mr->create       = "Create";
+$lang->mr->browse       = "Browse";
+$lang->mr->list         = "List";
+$lang->mr->edit         = "Edit";
+$lang->mr->delete       = "Delete";
+$lang->mr->view         = "View";
+$lang->mr->accept       = "Accept";
 $lang->mr->source       = 'source';
 $lang->mr->target       = 'target';
-$lang->mr->viewDiff     = 'view diff';
-$lang->mr->viewInGitlab = 'view in GitLab';
+$lang->mr->viewDiff     = 'View diff';
+$lang->mr->viewInGitlab = 'View in GitLab';
 
 $lang->mr->id          = 'ID';
 $lang->mr->mriid       = "raw MR ID";
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 1ca3226c0c..49f3219081 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -1,4 +1,5 @@
 <?php
+$lang->mr = new stdclass;
 $lang->mr->common       = "合并请求";
 $lang->mr->create       = "创建{$lang->mr->common}";
 $lang->mr->browse       = "浏览{$lang->mr->common}";
@@ -6,6 +7,7 @@ $lang->mr->list         = $lang->mr->browse;
 $lang->mr->edit         = "编辑{$lang->mr->common}";
 $lang->mr->delete       = "删除{$lang->mr->common}";
 $lang->mr->view         = "{$lang->mr->common}详情";
+$lang->mr->accept       = "合并请求";
 $lang->mr->source       = '源项目分支';
 $lang->mr->target       = '目标项目分支';
 $lang->mr->viewDiff     = '比对代码';

From b8f2ff9f22b7cb72f22500661084621ed6bdf5d8 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:59:46 +0800
Subject: [PATCH 06/28]  * Fix bug #15021.

---
 module/common/model.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 497b51267c..e42b58def5 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -358,7 +358,7 @@ class commonModel extends model
         $html .= "<i class='icon icon-plus-solid-circle text-secondary'></i>";
         $html .= "</a><ul class='dropdown-menu pull-right create-list'>";
 
-        $showCreateList = $lastIsDivider = $needPrintDivider = false;
+        $showCreateList = $needPrintDivider = false;
         $productID      = isset($_SESSION['product']) ? $_SESSION['product'] : 0;
         if(!$productID and $app->user->view->products) $productID = current(explode(',', $app->user->view->products));
 
@@ -379,16 +379,11 @@ class commonModel extends model
             if(common::hasPriv($objectType, $createMethod))
             {
                 /* Determines whether to print a divider. */
-                if(!$lastIsDivider and $needPrintDivider and $showCreateList)
+                if($needPrintDivider and $showCreateList)
                 {
                     $html            .= '<li class="divider"></li>';
-                    $lastIsDivider    = true;
                     $needPrintDivider = false;
                 }
-                else
-                {
-                    $lastIsDivider = false;
-                }
 
                 $showCreateList = true;
                 $isOnlyBody     = $objectType == 'doc';

From b2e0b0c82b66690da7e7f3eb6240b27d03fd9309 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:00:56 +0800
Subject: [PATCH 07/28] * skip to render lane name in classic mode in product
 kanban.

---
 module/product/js/kanban.js         | 2 +-
 module/product/view/kanban.html.php | 1 +
 www/js/zui/kanban/min.css           | 2 +-
 www/js/zui/kanban/min.js            | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index 23c7693321..88c8514177 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -141,6 +141,6 @@ $(function()
     $.each(kanbanList, function(key, programsData)
     {
         var data = processKanbanData(key, programsData);
-        $('#kanban-' + key).kanban({data: data});
+        $('#kanban-' + key).kanban({data: data, noLaneName: isClassicMode});
     });
 });
diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php
index ff6fdd222b..8549a5ca7f 100644
--- a/module/product/view/kanban.html.php
+++ b/module/product/view/kanban.html.php
@@ -48,6 +48,7 @@ $userPrivs['productplan'] = common::hasPriv('productplan', 'view');
 $userPrivs['project']     = common::hasPriv('project', 'index');
 $userPrivs['execution']   = common::hasPriv('execution', 'task');
 $userPrivs['release']     = common::hasPriv('release', 'view');
+js::set('isClassicMode',    $config->systemMode != 'new');
 js::set('kanbanColumns',    $kanbanColumns);
 js::set('userPrivs',        $userPrivs);
 js::set('kanbanList',       $kanbanList);
diff --git a/www/js/zui/kanban/min.css b/www/js/zui/kanban/min.css
index c5856f8b68..9810c8c5c1 100644
--- a/www/js/zui/kanban/min.css
+++ b/www/js/zui/kanban/min.css
@@ -3,4 +3,4 @@
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
- */.kanban{min-height:300px;overflow-x:auto}.kanban-header,.kanban-lane,.kanban-sub-lane{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;flex-direction:row;background-color:#f1f3f5;border-bottom:1px solid #d5d9de;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap}.no-flex .kanban-lane{padding-left:20px}.kanban-header{padding-left:20px;background-color:rgba(0,0,0,.07)}.kanban-col{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.not-use-flex .kanban-col{-webkit-box-flex:0;-webkit-flex:none;-ms-flex:none;flex:none}.no-flex .kanban-col{float:left}.kanban-col+.kanban-col{border-left:1px solid #d5d9de}.kanban-header-col{position:relative;height:32px}.kanban-header-col>.title{display:block;margin:6px 32px;line-height:20px;text-align:center}.kanban-header-col>.title>.text{display:inline-block;max-width:100px;margin:0 5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kanban-header-col>.title>.count,.kanban-header-col>.title>.icon{position:relative;top:-6px}.kanban-header-col[data-id=ADD]>.title{margin:6px;opacity:.7}.kanban-header-col[data-id=ADD]>.actions{display:none}.kanban-header-col>.actions{position:absolute;top:0;right:0}.kanban-header-col>.actions>.btn{min-width:32px}.kanban-header-col>.actions>.btn>.icon{opacity:.5}.kanban-lane{min-height:100px;margin-bottom:3px}.kanban-lane-name{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:20px;padding:10px 0;color:#fff;text-align:center;background-color:#3dc6fd;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-flex:0;-webkit-flex:none;-ms-flex:none;flex:none}.no-flex .kanban-lane-name{position:absolute;top:0;bottom:0;left:0}.kanban-header+.kanban-lane>.kanban-lane-name{margin-top:-33px}.kanban-lane-name .char{display:block;line-height:1;white-space:pre}.kanban-lane-name .char.rotate-90{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.kanban-lane-name.is-arab{font-size:12px;-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.kanban-lane-name.is-arab .char{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.kanban-sub-lanes{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;flex-direction:column;-webkit-box-flex:1;-webkit-flex:auto;-ms-flex:auto;flex:auto;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;-webkit-box-pack:stretch;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column}.kanban-sub-lane{-webkit-box-flex:1;-webkit-flex:auto;-ms-flex:auto;flex:auto}.kanban-lane-col.drop-to{outline:3px solid rgba(255,190,57,.25);outline-offset:-3px}.kanban-lane-col.drop-to .kanban-lane-actions>.btn{background-color:rgba(255,190,57,.25);border:1px dotted #ff9800}.kanban-lane-col.drop-to .kanban-lane-actions>.btn>span{opacity:0}.kanban-lane-col[data-type=EMPTY]{background-color:#fff}.kanban-lane-items{max-height:300px;padding:0 15px;overflow:auto}.kanban-lane-actions{padding:10px 15px}.kanban-item{padding:10px;margin-top:10px;background:#fff;border:1px solid #fff;border-radius:4px;-webkit-transition:-webkit-box-shadow .2s,-webkit-transform .2s;-o-transition:box-shadow .2s,-o-transform .2s;transition:-webkit-box-shadow .2s,-webkit-transform .2s;transition:box-shadow .2s,transform .2s;transition:box-shadow .2s,transform .2s,-webkit-box-shadow .2s,-webkit-transform .2s,-o-transform .2s}.kanban-item.drag-from{background-color:#aaa;opacity:.2}.kanban-item:hover{border-color:rgba(0,0,0,.1);-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.09);box-shadow:0 4px 10px 0 rgba(0,0,0,.09)}.kanban-item.drag-shadow{border-color:rgba(0,0,0,.2);-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.09),0 4px 20px 0 rgba(0,0,0,.5);box-shadow:0 4px 10px 0 rgba(0,0,0,.09),0 4px 20px 0 rgba(0,0,0,.5);-webkit-transform:scale(1.1);-ms-transform:scale(1.1);-o-transform:scale(1.1);transform:scale(1.1)}
\ No newline at end of file
+ */.kanban{min-height:300px;overflow-x:auto}.kanban-header,.kanban-lane,.kanban-sub-lane{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;flex-direction:row;background-color:#f1f3f5;border-bottom:1px solid #d5d9de;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap}.no-flex .kanban-lane{padding-left:20px}.kanban-header{padding-left:20px;background-color:rgba(0,0,0,.07)}.kanban-no-lane-name .kanban-header{padding-left:0}.kanban-col{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.not-use-flex .kanban-col{-webkit-box-flex:0;-webkit-flex:none;-ms-flex:none;flex:none}.no-flex .kanban-col{float:left}.kanban-col+.kanban-col{border-left:1px solid #d5d9de}.kanban-header-col{position:relative;height:32px}.kanban-header-col>.title{display:block;margin:6px 32px;line-height:20px;text-align:center}.kanban-header-col>.title>.text{display:inline-block;max-width:100px;margin:0 5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kanban-header-col>.title>.count,.kanban-header-col>.title>.icon{position:relative;top:-6px}.kanban-header-col[data-id=ADD]>.title{margin:6px;opacity:.7}.kanban-header-col[data-id=ADD]>.actions{display:none}.kanban-header-col>.actions{position:absolute;top:0;right:0}.kanban-header-col>.actions>.btn{min-width:32px}.kanban-header-col>.actions>.btn>.icon{opacity:.5}.kanban-lane{min-height:100px;margin-bottom:3px}.kanban-lane-name{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:20px;padding:10px 0;color:#fff;text-align:center;background-color:#3dc6fd;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-flex:0;-webkit-flex:none;-ms-flex:none;flex:none}.no-flex .kanban-lane-name{position:absolute;top:0;bottom:0;left:0}.kanban-header+.kanban-lane>.kanban-lane-name{margin-top:-33px}.kanban-lane-name .char{display:block;line-height:1;white-space:pre}.kanban-lane-name .char.rotate-90{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.kanban-lane-name.is-arab{font-size:12px;-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.kanban-lane-name.is-arab .char{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.kanban-sub-lanes{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;flex-direction:column;-webkit-box-flex:1;-webkit-flex:auto;-ms-flex:auto;flex:auto;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;-webkit-box-pack:stretch;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column}.kanban-sub-lane{-webkit-box-flex:1;-webkit-flex:auto;-ms-flex:auto;flex:auto}.kanban-lane-col.drop-to{outline:3px solid rgba(255,190,57,.25);outline-offset:-3px}.kanban-lane-col.drop-to .kanban-lane-actions>.btn{background-color:rgba(255,190,57,.25);border:1px dotted #ff9800}.kanban-lane-col.drop-to .kanban-lane-actions>.btn>span{opacity:0}.kanban-lane-col[data-type=EMPTY]{background-color:#fff}.kanban-lane-items{max-height:300px;padding:0 15px;overflow:auto}.kanban-lane-actions{padding:10px 15px}.kanban-item{padding:10px;margin-top:10px;background:#fff;border:1px solid #fff;border-radius:4px;-webkit-transition:-webkit-box-shadow .2s,-webkit-transform .2s;-o-transition:box-shadow .2s,-o-transform .2s;transition:-webkit-box-shadow .2s,-webkit-transform .2s;transition:box-shadow .2s,transform .2s;transition:box-shadow .2s,transform .2s,-webkit-box-shadow .2s,-webkit-transform .2s,-o-transform .2s}.kanban-item.drag-from{background-color:#aaa;opacity:.2}.kanban-item:hover{border-color:rgba(0,0,0,.1);-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.09);box-shadow:0 4px 10px 0 rgba(0,0,0,.09)}.kanban-item.drag-shadow{border-color:rgba(0,0,0,.2);-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.09),0 4px 20px 0 rgba(0,0,0,.5);box-shadow:0 4px 10px 0 rgba(0,0,0,.09),0 4px 20px 0 rgba(0,0,0,.5);-webkit-transform:scale(1.1);-ms-transform:scale(1.1);-o-transform:scale(1.1);transform:scale(1.1)}
\ No newline at end of file
diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js
index 6956737449..ac1cbf366d 100644
--- a/www/js/zui/kanban/min.js
+++ b/www/js/zui/kanban/min.js
@@ -4,4 +4,4 @@
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
  */
-!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(d,i){var o=this;o.name=n,o.$=a(d),o.options=i=a.extend({},t.DEFAULTS,this.$.data(),i),o.data=i.data||[],o.render(o.data);var r=function(n){if(i.onAction){var e=a(this);i.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",r).on("dblclick",".action-dbc",r),"auto"===i.droppable&&(i.droppable=!i.readonly),i.droppable){var s={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof i.droppable?i.droppable(a):i.onAction&&i.onAction("dropItem",a.element,a,o)}};"object"==typeof i.droppable&&a.extend(s,i.droppable),o.$.droppable(s)}e&&i.useFlex||a(window).on("resize",function(){o.adjustSize()}),!i.useFlex&&e&&o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",n.options.readonly),n.$.children(".kanban-board").addClass("kanban-expired");for(var d=0;d<t.length;++d)n.renderKanban(d);n.$.children(".kanban-expired").remove(),e&&n.options.useFlex||setTimeout(n.adjustSize.bind(this),200),n.options.onRender&&n.options.onRender(n)},t.prototype.renderKanban=function(n){if("number"==typeof n)n=this.data[n];else{var t=this.data.findIndex(function(a){return a.id===n.id});if(t>-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var i=this,o=i.$,r=o.children('.kanban-board[data-id="'+n.id+'"]');r.length?r.removeClass("kanban-expired"):(r=a('<div class="kanban-board" data-id="'+n.id+'"></div>').appendTo(o),e||r.addClass("no-flex")),i.renderKanbanHeader(n,r),r.children(".kanban-lane").addClass("kanban-expired");for(var s=n.lanes||[],l=0;l<s.length;++l)i.renderLane(s[l],n.columns,r);r.children(".kanban-expired").remove();for(var l=0;l<n.columns.length;++l){var c=n.columns[l].id,p=r.find('.kanban-lane-col[data-id="'+c+'"] > .kanban-lane-items > .kanban-item').length;r.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||"")}i.adjustKanbanSize(n,r),i.options.onRenderKanban&&i.options.onRenderKanban(r,n,i)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var i=t.children(".kanban-header");i.length||(i=a('<div class="kanban-header"></div>').prependTo(t),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,r=0;r<o.length;++r)d.renderHeaderCol(o[r],i);this.options.readonly||d.renderHeaderCol({id:"ADD",kanban:n.id,name:d.options.createColumnText,icon:"plus",type:"ADD"},i),i.children(".kanban-expired").remove()},t.prototype.renderHeaderCol=function(n,e){var t=e.children('.kanban-header-col[data-id="'+n.id+'"]'),d="ADD"===n.id;if(t.length)t.removeClass("kanban-expired"),d&&t.appendTo(e);else{t=a(['<div class="kanban-col kanban-header-col" data-id="'+n.id+'">',"<"+(d?"a":"div")+' class="title">','<i class="icon"></i>','<span class="text"></span>','<span class="count"></span>',"</"+(d?"a":"div")+">","</div>"].join("")).appendTo(e),d?t.children(".title").addClass("action").attr("data-action","addCol"):(t.children(".title").addClass("action-dbc").attr("data-action","editCol"),this.options.readonly||t.append(['<div class="actions">','<button class="btn btn-link action" type="button" data-action="headerMore"><i class="icon icon-more-v"></i></button>',"</div>"].join("")));var i=this.options.minColumnWidth;i&&t.css("min-width",i)}t.data("col",n),t.attr("data-type",n.type),t.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),t.find(".title>.text").text(n.name),t.find(".title>.count").text(n.count||""),this.options.onRenderHeaderCol&&this.options.onRenderHeaderCol(t,n,e)},t.prototype.renderLane=function(n,t,d){var i=this;d=d||i.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=d.children('.kanban-lane[data-id="'+n.id+'"]');o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-lane" data-id="'+n.id+'"></div>').appendTo(d),e||o.addClass("clearfix")),o.data("lane",n);var r=o.children('.kanban-lane-name[data-id="'+n.id+'"]');r.length||(r=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+n.id+'"></div>').appendTo(o));for(var s=[],l=0;l<n.name.length;++l){if(l>15){s.push('<span class="char rotate-90">…</span>');break}s.push('<span class="char">'+n.name[l]+"</span>")}r.toggleClass("is-arab",/^[\da-zA-Z ]+$/.test(n.name)).attr("title",n.name).html('<span class="text">'+s.join("")+"</span>"),n.color&&r.css("background-color",n.color),i.options.onRenderLaneName&&i.options.onRenderLaneName(r,n,d,t),o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),n.subLanes?i.renderSubLanes(n,t,o):i.renderLaneItems(t,n.items,o),i.options.readonly||i.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var d=this,i=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):i=a('<div class="kanban-sub-lanes" data-id="'+n.id+'"></div>').appendTo(t),i.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<n.subLanes.length;++o){var r=n.subLanes[o];d.renderSubLane(r,e,i)}i.children(".kanban-expired").remove()},t.prototype.renderSubLane=function(n,t,d){var i=d.children('.kanban-sub-lane[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):(i=a('<div class="kanban-sub-lane" data-id="'+n.id+'"></div>').appendTo(d),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,i),i.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,d=0;d<a.length;++d){var i=a[d],o=t.renderLaneCol(i,e),r=n[i.type]||[];t.renderColumnItems(i,r,o)}},t.prototype.renderColumnItems=function(a,n,e){var t=e.find(".kanban-lane-items");t.children(".kanban-item").addClass("kanban-expired");for(var d=0;d<n.length;++d){var i=n[d];this.renderLaneItem(i,t,a)}t.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(n,e){var t=this,d=e.children('.kanban-lane-col[data-id="'+n.id+'"]');if(d.length)d.removeClass("kanban-expired");else{d=a('<div class="kanban-col kanban-lane-col" data-id="'+n.id+'"></div>').appendTo(e),"EMPTY"!==n.id&&(d.append('<div class="kanban-lane-items"></div>'),t.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+t.options.addItemText+"</span></button>","</div>"].join("")));var i=t.options;i.minColumnWidth&&d.css("min-width",i.minColumnWidth),i.maxColHeight&&d.find(".kanban-lane-items").css("max-height",i.maxColHeight),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr("data-type",n.type),d},t.prototype.renderLaneItem=function(n,e,t){var d=e.children('.kanban-item[data-id="'+n.id+'"]');if(d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-item" data-id="'+n.id+'"></div>').appendTo(e),this.options.itemRender)this.options.itemRender(n,d,t);else{var i=d.find(".title");i.length||(i=a('<div class="title"></div>').appendTo(d)),i.text(n.name||n.title)}return d},t.prototype.adjustKanbanSize=function(n,t){var d=this,i=d.options.laneNameWidth,o=n.columns.length+(d.options.readonly?0:1),r=d.options.minColumnWidth*o+i;if(t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]'),t.css({minWidth:r}),!d.options.useFlex||!e){var s=Math.max(r,d.$.width()),l=Math.floor((s-i)/o);t.find(".kanban-col").css("width",l),t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col").css("height",e)})}},t.prototype.adjustSize=function(){for(var a=0;a<this.data.length;++a)this.adjustKanbanSize(this.data[a])},t.DEFAULTS={minColumnWidth:100,maxColHeight:400,laneNameWidth:20,addItemText:"添加条目",createColumnText:"添加看板列",useFlex:!0,itemRender:null,droppable:"auto",readonly:!1,laneColClass:""},a.fn.kanban=function(e){return this.each(function(){var d=a(this),i=d.data(n),o="object"==typeof e&&e;i||d.data(n,i=new t(this,o)),"string"==typeof e&&i[e]()})},t.NAME=n,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file
+!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(d,i){var o=this;o.name=n,o.$=a(d),o.options=i=a.extend({},t.DEFAULTS,this.$.data(),i),o.data=i.data||[],o.render(o.data);var r=function(n){if(i.onAction){var e=a(this);i.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",r).on("dblclick",".action-dbc",r),"auto"===i.droppable&&(i.droppable=!i.readonly),i.droppable){var s={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof i.droppable?i.droppable(a):i.onAction&&i.onAction("dropItem",a.element,a,o)}};"object"==typeof i.droppable&&a.extend(s,i.droppable),o.$.droppable(s)}e&&i.useFlex||a(window).on("resize",function(){o.adjustSize()}),!i.useFlex&&e&&o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",!!n.options.readonly).toggleClass("kanban-no-lane-name",!!n.options.noLaneName),n.$.children(".kanban-board").addClass("kanban-expired");for(var d=0;d<t.length;++d)n.renderKanban(d);n.$.children(".kanban-expired").remove(),e&&n.options.useFlex||setTimeout(n.adjustSize.bind(this),200),n.options.onRender&&n.options.onRender(n)},t.prototype.renderKanban=function(n){if("number"==typeof n)n=this.data[n];else{var t=this.data.findIndex(function(a){return a.id===n.id});if(t>-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var i=this,o=i.$,r=o.children('.kanban-board[data-id="'+n.id+'"]');r.length?r.removeClass("kanban-expired"):(r=a('<div class="kanban-board" data-id="'+n.id+'"></div>').appendTo(o),e||r.addClass("no-flex")),i.renderKanbanHeader(n,r),r.children(".kanban-lane").addClass("kanban-expired");for(var s=n.lanes||[],l=0;l<s.length;++l)i.renderLane(s[l],n.columns,r);r.children(".kanban-expired").remove();for(var l=0;l<n.columns.length;++l){var c=n.columns[l].id,p=r.find('.kanban-lane-col[data-id="'+c+'"] > .kanban-lane-items > .kanban-item').length;r.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||"")}i.adjustKanbanSize(n,r),i.options.onRenderKanban&&i.options.onRenderKanban(r,n,i)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var i=t.children(".kanban-header");i.length||(i=a('<div class="kanban-header"></div>').prependTo(t),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,r=0;r<o.length;++r)d.renderHeaderCol(o[r],i);this.options.readonly||d.renderHeaderCol({id:"ADD",kanban:n.id,name:d.options.createColumnText,icon:"plus",type:"ADD"},i),i.children(".kanban-expired").remove()},t.prototype.renderHeaderCol=function(n,e){var t=e.children('.kanban-header-col[data-id="'+n.id+'"]'),d="ADD"===n.id;if(t.length)t.removeClass("kanban-expired"),d&&t.appendTo(e);else{t=a(['<div class="kanban-col kanban-header-col" data-id="'+n.id+'">',"<"+(d?"a":"div")+' class="title">','<i class="icon"></i>','<span class="text"></span>','<span class="count"></span>',"</"+(d?"a":"div")+">","</div>"].join("")).appendTo(e),d?t.children(".title").addClass("action").attr("data-action","addCol"):(t.children(".title").addClass("action-dbc").attr("data-action","editCol"),this.options.readonly||t.append(['<div class="actions">','<button class="btn btn-link action" type="button" data-action="headerMore"><i class="icon icon-more-v"></i></button>',"</div>"].join("")));var i=this.options.minColumnWidth;i&&t.css("min-width",i)}t.data("col",n),t.attr("data-type",n.type),t.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),t.find(".title>.text").text(n.name),t.find(".title>.count").text(n.count||""),this.options.onRenderHeaderCol&&this.options.onRenderHeaderCol(t,n,e)},t.prototype.renderLane=function(n,t,d){var i=this;d=d||i.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=d.children('.kanban-lane[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-lane" data-id="'+n.id+'"></div>').appendTo(d),e||o.addClass("clearfix")),o.data("lane",n),!i.options.noLaneName){var r=o.children('.kanban-lane-name[data-id="'+n.id+'"]');r.length||(r=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+n.id+'"></div>').appendTo(o));for(var s=[],l=0;l<n.name.length;++l){if(l>15){s.push('<span class="char rotate-90">…</span>');break}s.push('<span class="char">'+n.name[l]+"</span>")}r.toggleClass("is-arab",/^[\da-zA-Z ]+$/.test(n.name)).attr("title",n.name).html('<span class="text">'+s.join("")+"</span>"),n.color&&r.css("background-color",n.color),i.options.onRenderLaneName&&i.options.onRenderLaneName(r,n,d,t)}o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),n.subLanes?i.renderSubLanes(n,t,o):i.renderLaneItems(t,n.items,o),i.options.readonly||i.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var d=this,i=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):i=a('<div class="kanban-sub-lanes" data-id="'+n.id+'"></div>').appendTo(t),i.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<n.subLanes.length;++o){var r=n.subLanes[o];d.renderSubLane(r,e,i)}i.children(".kanban-expired").remove()},t.prototype.renderSubLane=function(n,t,d){var i=d.children('.kanban-sub-lane[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):(i=a('<div class="kanban-sub-lane" data-id="'+n.id+'"></div>').appendTo(d),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,i),i.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,d=0;d<a.length;++d){var i=a[d],o=t.renderLaneCol(i,e),r=n[i.type]||[];t.renderColumnItems(i,r,o)}},t.prototype.renderColumnItems=function(a,n,e){var t=e.find(".kanban-lane-items");t.children(".kanban-item").addClass("kanban-expired");for(var d=0;d<n.length;++d){var i=n[d];this.renderLaneItem(i,t,a)}t.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(n,e){var t=this,d=e.children('.kanban-lane-col[data-id="'+n.id+'"]');if(d.length)d.removeClass("kanban-expired");else{d=a('<div class="kanban-col kanban-lane-col" data-id="'+n.id+'"></div>').appendTo(e),"EMPTY"!==n.id&&(d.append('<div class="kanban-lane-items"></div>'),t.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+t.options.addItemText+"</span></button>","</div>"].join("")));var i=t.options;i.minColumnWidth&&d.css("min-width",i.minColumnWidth),i.maxColHeight&&d.find(".kanban-lane-items").css("max-height",i.maxColHeight),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr("data-type",n.type),d},t.prototype.renderLaneItem=function(n,e,t){var d=e.children('.kanban-item[data-id="'+n.id+'"]');if(d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-item" data-id="'+n.id+'"></div>').appendTo(e),this.options.itemRender)this.options.itemRender(n,d,t);else{var i=d.find(".title");i.length||(i=a('<div class="title"></div>').appendTo(d)),i.text(n.name||n.title)}return d},t.prototype.adjustKanbanSize=function(n,t){var d=this,i=d.options.noLaneName?0:d.options.laneNameWidth,o=n.columns.length+(d.options.readonly?0:1),r=d.options.minColumnWidth*o+i;if(t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]'),t.css({minWidth:r}),!d.options.useFlex||!e){var s=Math.max(r,d.$.width()),l=Math.floor((s-i)/o);t.find(".kanban-col").css("width",l),t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col").css("height",e)})}},t.prototype.adjustSize=function(){for(var a=0;a<this.data.length;++a)this.adjustKanbanSize(this.data[a])},t.DEFAULTS={minColumnWidth:100,maxColHeight:400,laneNameWidth:20,addItemText:"添加条目",createColumnText:"添加看板列",useFlex:!0,itemRender:null,droppable:"auto",readonly:!1,laneColClass:"",noLaneName:!1},a.fn.kanban=function(e){return this.each(function(){var d=a(this),i=d.data(n),o="object"==typeof e&&e;i||d.data(n,i=new t(this,o)),"string"==typeof e&&i[e]()})},t.NAME=n,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file

From 21964bc9988d300e39ea0a374013020937a999b3 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:04:20 +0800
Subject: [PATCH 08/28] * Finish task#42407.

---
 module/project/model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index b068dd6ea4..a29a431781 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1853,7 +1853,6 @@ class projectModel extends model
             {
                 $otherProjects[$topProgram][$project->status][$project->id] = $project;
             }
-
         }
 
         return array('kanbanGroup' => array('my' => $myProjects, 'other' => $otherProjects), 'latestExecutions' => $latestExecutions);

From e23b4cd7ff50a6fdb88ed42237db4127bf76e4cd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:09:23 +0800
Subject: [PATCH 09/28] * Fix bug #15010.

---
 module/execution/model.php | 18 +++++++++++-------
 module/project/model.php   |  5 ++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 37856dcef0..132dc5954f 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -694,10 +694,10 @@ class executionModel extends model
     public function start($executionID)
     {
         $oldExecution = $this->getById($executionID);
-        $now        = helper::now();
+        $now          = helper::now();
 
         $execution = fixer::input('post')
-            ->add('realBegan', $now)
+            ->add('realBegan', helper::today())
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
@@ -718,7 +718,8 @@ class executionModel extends model
     public function putoff($executionID)
     {
         $oldExecution = $this->getById($executionID);
-        $now        = helper::now();
+        $now          = helper::now();
+
         $execution = fixer::input('post')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
@@ -746,7 +747,8 @@ class executionModel extends model
     public function suspend($executionID)
     {
         $oldExecution = $this->getById($executionID);
-        $now        = helper::now();
+        $now          = helper::now();
+
         $execution = fixer::input('post')
             ->setDefault('status', 'suspended')
             ->setDefault('lastEditedBy', $this->app->user->account)
@@ -771,7 +773,8 @@ class executionModel extends model
     public function activate($executionID)
     {
         $oldExecution = $this->getById($executionID);
-        $now        = helper::now();
+        $now          = helper::now();
+
         $execution = fixer::input('post')
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
@@ -838,10 +841,11 @@ class executionModel extends model
     public function close($executionID)
     {
         $oldExecution = $this->getById($executionID);
-        $now        = helper::now();
+        $now          = helper::now();
+
         $execution = fixer::input('post')
             ->setDefault('status', 'closed')
-            ->setDefault('realEnd', $now)
+            ->setDefault('realEnd', helper::today())
             ->setDefault('closedBy', $this->app->user->account)
             ->setDefault('closedDate', $now)
             ->setDefault('lastEditedBy', $this->app->user->account)
diff --git a/module/project/model.php b/module/project/model.php
index a29a431781..5f045f624a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1113,7 +1113,7 @@ class projectModel extends model
         $now        = helper::now();
 
         $project = fixer::input('post')
-            ->add('realBegan', $now)
+            ->add('realBegan', helper::today())
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
@@ -1135,6 +1135,7 @@ class projectModel extends model
     {
         $oldProject = $this->getById($projectID);
         $now        = helper::now();
+
         $project = fixer::input('post')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
@@ -1185,6 +1186,7 @@ class projectModel extends model
     {
         $oldProject = $this->getById($projectID);
         $now        = helper::now();
+
         $project = fixer::input('post')
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
@@ -1252,6 +1254,7 @@ class projectModel extends model
     {
         $oldProject = $this->getById($projectID);
         $now        = helper::now();
+
         $project = fixer::input('post')
             ->setDefault('status', 'closed')
             ->setDefault('closedBy', $this->app->user->account)

From 1dbceea5717ae8846568b8159dee84006533597d Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:10:08 +0800
Subject: [PATCH 10/28] * Remove needless prompt for required fields.

---
 module/mr/view/create.html.php | 4 ++--
 module/mr/view/edit.html.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index e327e6eba6..c9a88a2f3c 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -23,7 +23,7 @@
           </tr>
           <tr>
              <th><?php echo $lang->mr->sourceProject;?></th>
-             <td class='required'>
+             <td>
                <div class='input-group'>
                  <?php echo html::select('sourceProject', array(''), '', "class='form-control chosen'");?>
                  <span class='input-group-addon fix-border'><?php echo $lang->mr->sourceBranch ?></span>
@@ -33,7 +33,7 @@
           </tr>
           <tr>
              <th><?php echo $lang->mr->targetProject;?></th>
-             <td class='required'>
+             <td>
                <div class='input-group'>
                  <?php echo html::select('targetProject', array(''), '', "class='form-control chosen'");?>
                  <span class='input-group-addon fix-border'><?php echo $lang->mr->targetBranch ?></span>
diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php
index e5d5b8c557..0433e42579 100644
--- a/module/mr/view/edit.html.php
+++ b/module/mr/view/edit.html.php
@@ -34,7 +34,7 @@
           </tr>
           <tr>
              <th><?php echo $lang->mr->targetProject;?></th>
-             <td class='required'>
+             <td>
                <div class='input-group'>
                  <span class='input-group-addon fix-border'>
                  <?php echo $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject)->name_with_namespace;?>

From 3e685690b4867dcbff9f26630ec23aa3dc3bff0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 8 Sep 2021 14:11:25 +0800
Subject: [PATCH 11/28] * Fix bug #15040.

---
 module/common/view/kanban.html.php  | 2 +-
 module/program/view/kanban.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index e8a333fa02..d395b96d58 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -136,7 +136,7 @@ function renderProjectItem(item, $item)
         {
             $item.addClass('link-block');
             $title = $('<a class="title" />')
-                .attr('href', $.createLink('project', 'index', 'projectID=' + item._id));
+                .attr('href', $.createLink('execution', 'task', 'executionID=' + item._id));
         }
         else
         {
diff --git a/module/program/view/kanban.html.php b/module/program/view/kanban.html.php
index 0421171509..cf0672ab5c 100644
--- a/module/program/view/kanban.html.php
+++ b/module/program/view/kanban.html.php
@@ -33,7 +33,7 @@
 $kanbanColumns = array();
 $kanbanColumns['unclosedProduct'] = array('name' => $lang->program->kanban->openProducts, 'type' => 'unclosedProduct');
 $kanbanColumns['unexpiredPlan']   = array('name' => $lang->program->kanban->unexpiredPlans, 'type' => 'unexpiredPlan');
-$kanbanColumns['waitProject']    = array('name' => $lang->program->kanban->waitingProjects, 'type' => 'waitProject');
+$kanbanColumns['waitProject']     = array('name' => $lang->program->kanban->waitingProjects, 'type' => 'waitProject');
 $kanbanColumns['doingProject']    = array('name' => $lang->program->kanban->doingProjects, 'type' => 'doingProject');
 $kanbanColumns['doingExecution']  = array('name' => $lang->program->kanban->doingExecutions, 'type' => 'doingExecution');
 $kanbanColumns['normalRelease']   = array('name' => $lang->program->kanban->normalReleases, 'type' => 'normalRelease');

From bf5242da87caef0abeda8e52107e4d86d1a7d885 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:12:10 +0800
Subject: [PATCH 12/28] * Finish task #42413.

---
 module/task/js/editestimate.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/module/task/js/editestimate.js b/module/task/js/editestimate.js
index 291f3072a6..41cbc4f5c3 100644
--- a/module/task/js/editestimate.js
+++ b/module/task/js/editestimate.js
@@ -1,7 +1,14 @@
+/**
+ * Confirm left.
+ *
+ * @access public
+ * @return void
+ */
 function confirmLeft()
 {
     if($('#left').val() === '0') return confirm(confirmRecord);
 }
+
 $(function()
 {
     $('.form-date').datetimepicker('setEndDate', today);

From 7e66fb46e9f43f67b1463f97cf4a0c18e8fa7a10 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:14:09 +0800
Subject: [PATCH 13/28] * Delete the unused code.

---
 module/product/js/kanban.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index 88c8514177..10296bc78c 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -71,7 +71,6 @@ function processKanbanData(key, programsData)
                 var productExecutions = classicExecution[productID];
                 if(productExecutions)
                 {
-                    console.log(productExecutions);
                     $.each(productExecutions, function(executionID, execution)
                     {
                         if(!execution || !execution.id) return;

From cc6c764780074fe2d14ac6c236833bf21c0d1fe0 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:14:15 +0800
Subject: [PATCH 14/28] * show doing project and execution in one row for
 project and program kanban.

---
 module/common/view/kanban.html.php | 37 +++++++++++++++++++++++++++++-
 module/product/css/kanban.css      |  8 -------
 module/product/js/kanban.js        | 28 ----------------------
 module/program/js/kanban.js        |  4 +---
 module/project/js/kanban.js        |  6 ++---
 5 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index d395b96d58..62c1b78c18 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -44,6 +44,16 @@
 #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item > .title {white-space: normal;}
 #kanbanList .kanban-col[data-type="normalRelease"] .kanban-item {text-align: center;}
 #kanbanList .kanban-affixed .kanban-header-col[data-type="doingProject"]:after {background-color: #606060;}
+
+/* Show project and execution in one row */
+#kanbanList .kanban-lane-col[data-type="doingProject"] {box-shadow: 2px 0 0 #fff;}
+#kanbanList .kanban-lane-col[data-type="doingProject"] + .kanban-lane-col {border-left: none;}
+#kanbanList .kanban-lane-col[data-type="doingProject"] > .kanban-lane-items {padding: 0; overflow: visible; max-height: none!important;}
+#kanbanList .project-row {position: relative; width: 200%; width: calc(200% + 2px); box-shadow: 0 2px 0 #fff;}
+#kanbanList .project-row + .project-row {margin-top: 2px;}
+#kanbanList .project-row > .project-col {float: left; width: 50%; padding: 10px;}
+#kanbanList .project-row > .project-col + .project-col {padding: 10px 9px 10px 11px;}
+#kanbanList .project-row > .execution-item {position: absolute!important; left: 100%; top: 0}
 </style>
 <script>
 /**
@@ -253,6 +263,31 @@ function renderReleaseItem(item, $item)
     return $item;
 }
 
+/**
+ * Render project item
+ * @param {Object} item  Project item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col   Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderDoingProjectItem(item, $item)
+{
+    $item.removeClass('kanban-item').addClass('project-row clearfix').empty();
+
+    var $projectCol = $('<div class="project-col"></div>').appendTo($item);
+    var $projectItem = $('<div class="kanban-item project-item"></div>').appendTo($projectCol);
+    renderProjectItem(item, $projectItem);
+
+    var $executionCol = $('<div class="project-col"></div>').appendTo($item);
+    if(item.execution)
+    {
+        var $executionItem = $('<div class="kanban-item execution-item"></div>').appendTo($executionCol);
+        renderExecutionItem(item, $executionItem);
+    }
+
+    return $item;
+}
+
 /** All build-in columns renderers */
 if(!window.columnRenderers) window.columnRenderers =
 {
@@ -260,7 +295,7 @@ if(!window.columnRenderers) window.columnRenderers =
     unexpiredPlan: renderPlanItem,
     waitProject: renderProjectItem,
     closedProject: renderProjectItem,
-    doingProject: renderProjectItem,
+    doingProject: renderDoingProjectItem,
     doingExecution: renderExecutionItem,
     normalRelease: renderReleaseItem,
 };
diff --git a/module/product/css/kanban.css b/module/product/css/kanban.css
index 11e232ccbe..e69de29bb2 100644
--- a/module/product/css/kanban.css
+++ b/module/product/css/kanban.css
@@ -1,8 +0,0 @@
-#kanbanList .kanban-lane-col[data-type="doingProject"] {box-shadow: 2px 0 0 #fff;}
-#kanbanList .kanban-lane-col[data-type="doingProject"] + .kanban-lane-col {border-left: none;}
-#kanbanList .kanban-lane-col[data-type="doingProject"] > .kanban-lane-items {padding: 0; overflow: visible; max-height: none!important;}
-#kanbanList .project-row {position: relative; width: 200%; width: calc(200% + 2px); box-shadow: 0 2px 0 #fff;}
-#kanbanList .project-row + .project-row {margin-top: 2px;}
-#kanbanList .project-row > .project-col {float: left; width: 50%; padding: 10px;}
-#kanbanList .project-row > .project-col + .project-col {padding: 10px 9px 10px 11px;}
-#kanbanList .project-row > .execution-item {position: absolute!important; left: 100%; top: 0}
diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index 10296bc78c..c582424c29 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -105,37 +105,9 @@ function processKanbanData(key, programsData)
     return {id: kanbanId, columns: columns, lanes: lanes};
 }
 
-/**
- * Render project item
- * @param {Object} item  Project item object
- * @param {JQuery} $item Kanban item element
- * @param {Object} col   Column object
- * @returns {JQuery} $item Kanban item element
- */
-function renderDoingProjectItem(item, $item)
-{
-    $item.removeClass('kanban-item').addClass('project-row clearfix').empty();
-
-    var $projectCol = $('<div class="project-col"></div>').appendTo($item);
-    var $projectItem = $('<div class="kanban-item project-item"></div>').appendTo($projectCol);
-    renderProjectItem(item, $projectItem);
-
-    var $executionCol = $('<div class="project-col"></div>').appendTo($item);
-    if(item.execution)
-    {
-        var $executionItem = $('<div class="kanban-item execution-item"></div>').appendTo($executionCol);
-        renderExecutionItem(item, $executionItem);
-    }
-
-    return $item;
-}
-
 
 $(function()
 {
-    /* Add custom renderer for doing project */
-    addColumnRenderer('doingProject', renderDoingProjectItem);
-
     /* Init all kanbans */
     $.each(kanbanList, function(key, programsData)
     {
diff --git a/module/program/js/kanban.js b/module/program/js/kanban.js
index 0f2ef79008..adf0bfa103 100644
--- a/module/program/js/kanban.js
+++ b/module/program/js/kanban.js
@@ -61,7 +61,6 @@ function processKanbanData(key, programsData)
 
             /* doing projects and executions */
             items.doingProject = [];
-            items.doingExecution = [];
             var doingProjects = product.projects && product.projects.doing;
             if(doingProjects)
             {
@@ -73,8 +72,7 @@ function processKanbanData(key, programsData)
 
                     var execution = project.execution;
                     if(!execution || !execution.id) return;
-                    var executionItem = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
-                    items.doingExecution.push(executionItem);
+                    projectItem.execution = execution;
                 });
             }
 
diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index 08408127ca..314aa98dd6 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -35,15 +35,15 @@ function processKanbanData(key, programGroup)
                 $.each(statusProjects, function(_, project)
                 {
                     var projectID = project.id;
-                    itemsList.push($.extend({}, project, {id: 'project-' + projectID, _id: projectID}));
+                    var projectItem = $.extend({}, project, {id: 'project-' + projectID, _id: projectID});
+                    itemsList.push(projectItem);
 
                     if(status === 'doing')
                     {
                         var execution = latestExecutions[projectID];
                         if(execution && execution.id)
                         {
-                            var executionItem = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
-                            items.doingExecution = [executionItem];
+                            projectItem.execution = $.extend({}, execution, {id: 'execution-' + execution.id, _id: execution.id});
                         }
                     }
                 });

From e291343d5692cdc42f8c877ec90afa86912fcea1 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:15:04 +0800
Subject: [PATCH 15/28] * Finish task #42408.

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

diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index fbbf987d3f..dfe48ac41a 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -116,7 +116,7 @@ class projectStory extends control
      */
     public function batchUnlinkStory($projectID, $storyIdList = '')
     {
-        $storyIdList      = array_filter(explode(',', $storyIdList));
+        $storyIdList      = if(empty($storyIdList)) ? array() : array_filter(explode(',', $storyIdList));
         $executionStories = $this->projectstory->getExecutionStories($projectID, $storyIdList);
         $html             = '';
 

From e7f44676dd3d9edc2ec93c5a5abe402fbf80d44c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:13:56 +0800
Subject: [PATCH 16/28] * Finish task#42402.

---
 module/project/view/managemembers.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 5c69b19a79..454e278fd9 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -40,8 +40,8 @@
         <?php unset($users[$member->account]);?>
         <tr>
           <td><?php echo html::input("realnames[$i]", $member->realname, "class='form-control' readonly");?></td>
-          <td><?php echo html::input("roles[$i]",    $member->role,     "class='form-control'");?></td>
-          <td><?php echo html::input("days[$i]",    $member->days,     "class='form-control'");?></td>
+          <td><?php echo html::input("roles[$i]", $member->role, "class='form-control'");?></td>
+          <td><?php echo html::input("days[$i]", $member->days, "class='form-control'");?></td>
           <td>
             <?php echo html::input("hours[$i]", $member->hours, "class='form-control'");?>
             <?php echo html::hidden("accounts[$i]", $member->account);?>

From fe446302a42d1094606ba7912d19bcc07948a4b7 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:22:12 +0800
Subject: [PATCH 17/28] * skip to show empty kanban.

---
 module/product/js/kanban.js         | 4 +++-
 module/product/view/kanban.html.php | 1 +
 module/project/js/kanban.js         | 4 +++-
 module/project/view/kanban.html.php | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index c582424c29..82d1b711a2 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -111,7 +111,9 @@ $(function()
     /* Init all kanbans */
     $.each(kanbanList, function(key, programsData)
     {
+        var $kanban = $('#kanban-' + key);
+        if(!$kanban.length) return;
         var data = processKanbanData(key, programsData);
-        $('#kanban-' + key).kanban({data: data, noLaneName: isClassicMode});
+        $kanban.kanban({data: data, noLaneName: isClassicMode});
     });
 });
diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php
index 8549a5ca7f..baf29cf299 100644
--- a/module/product/view/kanban.html.php
+++ b/module/product/view/kanban.html.php
@@ -18,6 +18,7 @@
 <?php else:?>
 <div id='kanbanList'>
   <?php foreach($kanbanList as $type => $programs):?>
+  <?php if(empty($programs)) continue;?>
   <div class='panel kanban-panel'>
     <div class='panel-heading'>
       <strong><?php echo $type == 'my' ? $lang->product->myProduct : $lang->product->otherProduct;?></strong>
diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index 314aa98dd6..a7a2fdba08 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -62,6 +62,8 @@ $(function()
     /* Init all kanbans */
     $.each(kanbanGroup, function(key, programGroup)
     {
-        $('#kanban-' + key).kanban({data: processKanbanData(key, programGroup)});
+        var $kanban = $('#kanban-' + key);
+        if(!$kanban.length) return;
+        $kanban.kanban({data: processKanbanData(key, programGroup)});
     });
 });
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 89d7f5ceb9..30c267af11 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -18,6 +18,7 @@
 <?php else:?>
 <div id='kanbanList'>
   <?php foreach($kanbanGroup as $type => $projectGroup):?>
+  <?php if(empty($projectGroup)) continue;?>
   <div class='panel kanban-panel'>
     <div class='panel-heading'>
       <strong><?php echo $lang->project->typeList[$type];?></strong>

From 2c957c59705b1697523b96ff3cf60e08d0b6f1e2 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:29:41 +0800
Subject: [PATCH 18/28] * Adjust column width in MR browse page.

---
 module/mr/view/browse.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index b379b00a8b..bdc6ae9441 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -31,12 +31,12 @@
         <tr>
           <?php $vars = "objectID=$objectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
           <th class='w-60px  text-left'><?php common::printOrderLink('id', $orderBy, $vars, $lang->mr->id); ?></th>
-          <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->mr->title); ?></th>
+          <th class='w-200px text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->mr->title); ?></th>
           <th class='text-left'><?php common::printOrderLink('sourceProject', $orderBy, $vars, $lang->mr->sourceProject); ?></th>
-          <th class='w-100px text-left'><?php common::printOrderLink('sourceBranch', $orderBy, $vars, $lang->mr->sourceBranch); ?></th>
+          <th class='w-120px text-left'><?php common::printOrderLink('sourceBranch', $orderBy, $vars, $lang->mr->sourceBranch); ?></th>
           <th class='text-left'><?php common::printOrderLink('targetProject', $orderBy, $vars, $lang->mr->targetProject); ?></th>
-          <th class='w-100px text-left'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch); ?></th>
-          <th class='w-100px text-left'><?php common::printOrderLink('mergeStatus', $orderBy, $vars, $lang->mr->mergeStatus); ?></th>
+          <th class='w-120px text-left'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch); ?></th>
+          <th class='w-120px text-left'><?php common::printOrderLink('mergeStatus', $orderBy, $vars, $lang->mr->mergeStatus); ?></th>
           <th class='w-120px c-actions-4'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>

From c636b99dcc1a1cd9eb8269f3e0701c37d9fd5f60 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:34:44 +0800
Subject: [PATCH 19/28] * Finish task #42390.

---
 module/product/js/all.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/product/js/all.js b/module/product/js/all.js
index dbe140ac94..80ba25e7aa 100644
--- a/module/product/js/all.js
+++ b/module/product/js/all.js
@@ -41,9 +41,9 @@ $(function()
         var $tbody = $('#productTableList');
         $tbody.find('.program-checkbox').each(function()
         {
-            var $checkbox = $(this);
-            var $tr = $checkbox.closest('tr');
-            var rowID = $tr.data('id');
+            var $checkbox       = $(this);
+            var $tr             = $checkbox.closest('tr');
+            var rowID           = $tr.data('id');
             var isAllRowChecked = !$tbody.find('tr[data-parent="' + rowID + '"] input:checkbox:not(:checked)').length;
             $checkbox.toggleClass('checked', isAllRowChecked);
         });

From c34679d10235718105dc5749e25a3d62d18067ea Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:47:45 +0800
Subject: [PATCH 20/28] * hide bottom border of last project row.

---
 module/common/view/kanban.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 62c1b78c18..fdf23be7f4 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -49,8 +49,8 @@
 #kanbanList .kanban-lane-col[data-type="doingProject"] {box-shadow: 2px 0 0 #fff;}
 #kanbanList .kanban-lane-col[data-type="doingProject"] + .kanban-lane-col {border-left: none;}
 #kanbanList .kanban-lane-col[data-type="doingProject"] > .kanban-lane-items {padding: 0; overflow: visible; max-height: none!important;}
-#kanbanList .project-row {position: relative; width: 200%; width: calc(200% + 2px); box-shadow: 0 2px 0 #fff;}
-#kanbanList .project-row + .project-row {margin-top: 2px;}
+#kanbanList .project-row {position: relative; width: 200%; width: calc(200% + 2px);}
+#kanbanList .project-row + .project-row {border-top: 2px solid #fff;}
 #kanbanList .project-row > .project-col {float: left; width: 50%; padding: 10px;}
 #kanbanList .project-row > .project-col + .project-col {padding: 10px 9px 10px 11px;}
 #kanbanList .project-row > .execution-item {position: absolute!important; left: 100%; top: 0}

From 0653d3d3aa931332c0be9fe9cb98ecedd9ef974c Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:52:47 +0800
Subject: [PATCH 21/28] * Finish task #42376.

---
 module/block/view/executionblock.html.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php
index 6840fa44ad..6854e2ab3d 100644
--- a/module/block/view/executionblock.html.php
+++ b/module/block/view/executionblock.html.php
@@ -14,6 +14,7 @@
 .table .c-progress {width: 60px;}
 .table .c-estimate {width: 85px;}
 .c-hours {text-align: right !important; padding-right: 24px !important;}
+.table .c-burn {width: 150px;}
 </style>
 <?php if(empty($executionStats)): ?>
 <div class='empty-tip'><?php common::printLink('execution', 'create', '', "<i class='icon-plus'></i> " . $lang->execution->create, '', "class='btn btn-primary'")?></div>
@@ -32,13 +33,13 @@
         <?php endif;?>
         <th class="c-progress"><?php echo $lang->execution->progress;?></th>
         <?php if($longBlock):?>
-        <th><?php echo $lang->execution->burn;?></th>
+        <th class="c-burn"><?php echo $lang->execution->burn;?></th>
         <?php endif;?>
       </tr>
     </thead>
     <tbody class="text-center">
-     <?php $id = 0; ?>
-     <?php foreach($executionStats as $execution):?>
+      <?php $id = 0; ?>
+      <?php foreach($executionStats as $execution):?>
       <?php
       $appid    = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
       $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
@@ -67,8 +68,8 @@
         <?php if($longBlock):?>
         <td id='spark-<?php echo $id++?>' class='no-padding text-left sparkline' values='<?php echo join(',', $execution->burns);?>'></td>
         <?php endif;?>
-     </tr>
-     <?php endforeach;?>
+      </tr>
+      <?php endforeach;?>
     </tbody>
   </table>
 </div>

From 57c7ed054dcbd3e511faff47cd3da85459ef852d Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:54:27 +0800
Subject: [PATCH 22/28] * Fixed GitLab selection when creating MR.

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

diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index c9a88a2f3c..cbe72b23e6 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -19,7 +19,8 @@
         <table class='table table-form'>
           <tr>
             <th><?php echo $lang->gitlab->common;?></th>
-            <td class='required'><?php echo html::select('gitlabID', $gitlabHosts, '', "class='form-control'");?></td>
+            <!-- Use `array('') + $gitlabHosts` here because of this field must be changed when creating this MR. -->
+            <td class='required'><?php echo html::select('gitlabID', array('') + $gitlabHosts, '', "class='form-control'");?></td>
           </tr>
           <tr>
              <th><?php echo $lang->mr->sourceProject;?></th>

From 7c2cf95f69dbec6d221865545aabe22a16be1a08 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 14:56:44 +0800
Subject: [PATCH 23/28] * Fix bug #14808.

---
 module/task/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/task/model.php b/module/task/model.php
index 62954e6b6c..05c8928de7 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -474,6 +474,7 @@ class taskModel extends model
         $task->left         = 0;
         $task->pri          = 3;
         $task->type         = 'devel';
+        $task->project      = $this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($executionID)->fetch('project');
 
         $this->dao->insert(TABLE_TASK)->data($task, $skip = 'id,product')
              ->autoCheck()

From 0172943dbc143105856286b7707d253801e779a5 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 15:13:33 +0800
Subject: [PATCH 24/28] * refactor.

---
 module/product/js/kanban.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index 82d1b711a2..60c0eff6cf 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -71,9 +71,10 @@ function processKanbanData(key, programsData)
                 var productExecutions = classicExecution[productID];
                 if(productExecutions)
                 {
-                    $.each(productExecutions, function(executionID, execution)
+                    $.each(productExecutions, function(_, execution)
                     {
                         if(!execution || !execution.id) return;
+                        var executionID = execution.id;
                         var executionItem = $.extend({}, execution, {id: 'execution-' + executionID, _id: executionID});
                         items.doingExecution.push(executionItem);
                     });

From d1bfa1aecc2342b8ce63a103922b4dad6d5e76e5 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 15:25:17 +0800
Subject: [PATCH 25/28] * adjust release item style in kanban.

---
 module/common/view/kanban.html.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index fdf23be7f4..2d78535bbb 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -42,7 +42,12 @@
 #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item {background-color: transparent; border: none; padding: 0; text-align: center;}
 #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item:hover {box-shadow: none;}
 #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item > .title {white-space: normal;}
-#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item {text-align: center;}
+#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center; height: 38px;}
+#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;}
+#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title.has-icon > .text {margin-right: 5px; max-width: calc(100% - 20px);}
+#kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: block; height: 38px;}
+#kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: inline-block;}
+#kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title > .icon {position: relative; top: -5px}
 #kanbanList .kanban-affixed .kanban-header-col[data-type="doingProject"]:after {background-color: #606060;}
 
 /* Show project and execution in one row */
@@ -247,12 +252,13 @@ function renderReleaseItem(item, $item)
         }
         $title.appendTo($item);
     }
-    $title.text(item.name).attr('title', item.name);
+    $title.html('<span class="text">' + item.name + '</span>')
+        .attr('title', item.name);
     if(item.marker === '1')
     {
         if(!$title.find('.icon').length)
         {
-            $title.append('&nbsp;<i class="icon icon-flag text-red"></i>');
+            $title.addClass('has-icon').append('<i class="icon icon-flag text-red"></i>');
         }
     }
     else

From 6fa640e5c6742f75200cf008f37b4aa15ea2df21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 8 Sep 2021 15:26:44 +0800
Subject: [PATCH 26/28] * Fix program kanban bug.

---
 module/common/view/kanban.html.php | 2 +-
 module/program/model.php           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 2d78535bbb..3c6c1fb5e6 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -151,7 +151,7 @@ function renderProjectItem(item, $item)
         {
             $item.addClass('link-block');
             $title = $('<a class="title" />')
-                .attr('href', $.createLink('execution', 'task', 'executionID=' + item._id));
+                .attr('href', $.createLink('project', 'index', 'projectID=' + item._id));
         }
         else
         {
diff --git a/module/program/model.php b/module/program/model.php
index 2563671382..8c4b96809b 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -176,7 +176,7 @@ class programModel extends model
             ->andWhere('end')->gt(helper::today())
             ->fetchGroup('product');
 
-        /* Get all products linked projects and executions. */
+        /* Get all products linked projects. */
         $projectGroup = $this->dao->select('t1.product, t2.id, t2.name, t2.status, t2.end')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')
             ->on('t1.project = t2.id')
@@ -184,6 +184,7 @@ class programModel extends model
             ->andWhere('t1.product')->in($productPairs)
             ->andWhere('t2.status')->ne('closed')
             ->andWhere('t2.type')->eq('project')
+            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->fetchGroup('product');
 
         $projectPairs = array();
@@ -201,6 +202,7 @@ class programModel extends model
             ->where('type')->in('sprint,stage')
             ->andWhere('status')->eq('doing')
             ->andWhere('deleted')->eq(0)
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->orderBy('id_asc')
             ->fetchAll('project');
 

From f495f058ed1aa02b4df7077cb0c5ecc22fd05aad Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 8 Sep 2021 15:31:11 +0800
Subject: [PATCH 27/28] * Finish
 task#42421,42411,42409,42403,42392,42388,42386,42374

---
 lib/base/front/front.class.php   |  7 +++----
 module/file/view/export.html.php | 14 ++++++++------
 module/my/model.php              |  6 ++----
 module/product/control.php       |  6 +++---
 module/program/js/common.js      |  2 +-
 module/project/model.php         |  4 ++--
 module/search/model.php          |  2 +-
 module/story/model.php           | 19 +++++++++----------
 module/testtask/lang/de.php      | 22 +++++++++++-----------
 module/testtask/lang/en.php      | 22 +++++++++++-----------
 module/testtask/lang/fr.php      | 22 +++++++++++-----------
 module/testtask/lang/vi.php      | 22 +++++++++++-----------
 module/testtask/lang/zh-cn.php   | 22 +++++++++++-----------
 module/testtask/lang/zh-tw.php   |  3 ++-
 module/testtask/model.php        |  4 ++--
 15 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index 15317426a8..7d12b3ac58 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -588,7 +588,7 @@ function selectAll(checker, scope, type)
     {
         if(type == 'button')
         {
-            var check = $(checker).data('check');
+            var check = $('#' + scope + ' input:checkbox').length == $('#' + scope + ' input:checkbox:checked').length ? false : true;
             $('#' + scope + ' input').each(function()
             {
                 $(this).prop("checked", check)
@@ -607,12 +607,11 @@ function selectAll(checker, scope, type)
     {
         if(type == 'button')
         {
-            var check = $(checker).data('check');
+            var check = $('input:checkbox').length == $('input:checkbox:checked').length ? false : true;
             $('input:checkbox').each(function()
             {
                 $(this).prop("checked", check)
             });
-            $(checker).data('check', check == true ? false :true);
         }
         else if(type == 'checkbox')
         {
@@ -632,7 +631,7 @@ EOT;
         }
         elseif($type == 'button')
         {
-            $string .= "<input type='button' name='allchecker' id='allchecker' data-check=true class='btn btn-select-all $class' value='{$lang->selectAll}' onclick='selectAll(this, \"$scope\", \"$type\")' />";
+            $string .= "<input type='button' name='allchecker' id='allchecker' class='btn btn-select-all $class' value='{$lang->selectAll}' onclick='selectAll(this, \"$scope\", \"$type\")' />";
         }
 
         return  $string;
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index bfb6a9915a..71b1d8dc91 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -121,12 +121,13 @@ function setExportTPL()
 /**
  * Set whether part download.
  * 
+ * @param  input target
  * @access public
  * @return void
  */
-function setPart(t)
+function setPart(target)
 {
-    if($(t).prop("checked"))
+    if($(target).prop("checked"))
     {
         $("#submit").attr("onclick", 'setPartDownloading();');
     }
@@ -147,10 +148,10 @@ var partQueue = new Array();
 function setPartDownloading()
 {
     var partNum = 10000;
-    var total = $('.pager', window.parent.document).data('rec-total');
-    for(var i=0; i < total; i = i + partNum)
+    var total   = $('.pager', window.parent.document).data('rec-total');
+    for(var i = 0; i < total; i = i + partNum)
     {
-        partQueue.push(i+','+partNum); 
+        partQueue.push(i + ',' + partNum);
     }
     $.cookie('downloading', 0);
     $('#mainContent').addClass('loading');
@@ -170,7 +171,8 @@ function setPartDownloading()
  */
 function startPartDownloading()
 {
-    if($.cookie('downloading') == 1){
+    if($.cookie('downloading') == 1)
+    {
         var limit = partQueue.shift();
         if(limit)
         {
diff --git a/module/my/model.php b/module/my/model.php
index 70d7d6de8d..bc9cb724d3 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -113,7 +113,7 @@ class myModel extends model
             $product->releases   = isset($releases[$product->id]) ? $releases[$product->id] : 0;
             if(isset($executions[$product->id])) $product->executions = $executions[$product->id];
             $product->storyEstimateCount = isset($stories[$product->id]) ? $stories[$product->id] : 0;
-            if($product->status != 'closed') $unclosedCount++;
+            if($product->status != 'closed') $unclosedCount ++;
             if($product->status == 'closed') unset($products[$key]);
         }
 
@@ -125,7 +125,6 @@ class myModel extends model
         $data->allCount      = $allCount;
         $data->unclosedCount = $unclosedCount;
         $data->products      = array_values($products);
-
         return $data;
     }
 
@@ -143,7 +142,7 @@ class myModel extends model
         $doingProjects    = array();
 
         $projects         = $this->loadModel('project')->getOverviewList('byStatus', 'all', 'id_desc');
-        $projectsConsumed = $this->project->getProjectsConsumed(array_keys($projects), 'this_year');
+        $projectsConsumed = $this->project->getProjectsConsumed(array_keys($projects), 'THIS_YEAR');
         $doingCount       = 0;
         foreach($projects as $key => $project)
         {
@@ -167,7 +166,6 @@ class myModel extends model
         $data->allConsumed        = $allConsumed;
         $data->thisYearConsumed   = $thisYearConsumed;
         $data->projects           = $doingProjects;
-
         return $data;
     }
 
diff --git a/module/product/control.php b/module/product/control.php
index e7bdc869b0..cbe86c7e9e 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1321,15 +1321,15 @@ class product extends control
                     $rowspan[$i]['rows']['program'] = 1;
                     $programI = $i;
                 }
-                else $rowspan[$programI]['rows']['program']++;
+                else $rowspan[$programI]['rows']['program'] ++;
                 if($lastLine == '' or $product->line != $lastLine)
                 {
                     $rowspan[$i]['rows']['line'] = 1;
                     $lineI = $i;
                 }
-                else $rowspan[$lineI]['rows']['line']++;
+                else $rowspan[$lineI]['rows']['line'] ++;
                 $lastProgram = $product->program;
-                $lastLine = $product->line;
+                $lastLine    = $product->line;
 
                 if($this->post->exportType == 'selected')
                 {
diff --git a/module/program/js/common.js b/module/program/js/common.js
index ee200bbefa..67a2acfcb0 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -75,7 +75,7 @@ function computeWorkDays(currentID)
     {
         beginDate = $('#begin').val();
         endDate   = $('#end').val();
-        
+
         var begin = new Date(beginDate.replace(/-/g,"/"));
         var end   = new Date(endDate.replace(/-/g,"/"));
         var time  = end.getTime() - begin.getTime();
diff --git a/module/project/model.php b/module/project/model.php
index 5f045f624a..1da6cf4d9a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -411,7 +411,7 @@ class projectModel extends model
         $totalConsumeds = $this->dao->select('project,ROUND(SUM(consumed), 1) AS totalConsumed')
             ->from(TABLE_TASK)
             ->where('project')->in($projectIdList)
-            ->beginIF($time == 'this_year')->andWhere('realStarted')->ge(date("Y-01-01 00:00:00"))->fi()
+            ->beginIF($time == 'THIS_YEAR')->andWhere('realStarted')->ge(date("Y-01-01 00:00:00"))->fi()
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->groupBy('project')
@@ -421,7 +421,7 @@ class projectModel extends model
         {
             $project = new stdClass();
             $project->totalConsumed = isset($totalConsumeds[$projectID]->totalConsumed) ? $totalConsumeds[$projectID]->totalConsumed : 0;
-            $projects[$projectID] = $project;
+            $projects[$projectID]   = $project;
         }
 
         return $projects;
diff --git a/module/search/model.php b/module/search/model.php
index 3a9605b8c8..5fb8555fad 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -943,7 +943,7 @@ class searchModel extends model
     {
         $words = explode(' ', trim($keywords, ' '));
         $markedWords = array();
-        $leftMark = '|0000';
+        $leftMark  = '|0000';
         $rightMark = '0000|';
 
         foreach($words as $key => $word)
diff --git a/module/story/model.php b/module/story/model.php
index f8a7069df9..cc831c5efb 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3953,17 +3953,16 @@ class storyModel extends model
 
         if(count($tracks) < $pager->recPerPage)
         {
-            /* Show of child story */
+            /* Show sub stories. */
             $storiesCopy = array();
             foreach($stories as $id => $story)
             {
                 $storiesCopy[$id] = $story;
-                if(isset($story->children) and count($story->children) > 0)
+
+                if(!isset($story->children) or count($story->children) == 0) continue;
+                foreach($story->children as $childID => $children)
                 {
-                    foreach($story->children as $childID => $children)
-                    {
-                        $storiesCopy[$childID] = $children;
-                    }
+                    $storiesCopy[$childID] = $children;
                 }
             }
             $stories = $storiesCopy;
@@ -3972,10 +3971,10 @@ class storyModel extends model
             {
                 $stories[$id] = new stdclass();
                 $stories[$id]->parent = $story->parent;
-                $stories[$id]->title = $story->title;
-                $stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
-                $stories[$id]->bugs  = $this->loadModel('bug')->getStoryBugs($id);
-                $stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
+                $stories[$id]->title  = $story->title;
+                $stories[$id]->cases  = $this->loadModel('testcase')->getStoryCases($id);
+                $stories[$id]->bugs   = $this->loadModel('bug')->getStoryBugs($id);
+                $stories[$id]->tasks  = $this->loadModel('task')->getStoryTasks($id);
                 if(isset($this->config->maxVersion))
                 {
                     $stories[$id]->designs   = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 04b650001b..080265c9a6 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -124,17 +124,17 @@ $lang->testtask->fail          = 'Fehlgeschlagen';
 $lang->testtask->showResult    = 'Ausführungen <span class="text-info">%s</span>';
 $lang->testtask->showFail      = 'Fehlgeschlagen <span class="text-danger">%s</span>';
 
-$lang->testtask->confirmDelete      = 'Möchten Sie dieses Build löschen?';
-$lang->testtask->confirmUnlinkCase  = 'Möchten Sie die Verknüpfung zu dem Fall aufheben?';
-$lang->testtask->noticeNoOther      = 'Es existieren keine weiteren Testaufgaben für dieses Produkt';
-$lang->testtask->noTesttask         = 'Keine Testaufgaben. ';
-$lang->testtask->checkLinked        = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
-$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto        = "%s automated testing";
-$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
-$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
+$lang->testtask->confirmDelete     = 'Möchten Sie dieses Build löschen?';
+$lang->testtask->confirmUnlinkCase = 'Möchten Sie die Verknüpfung zu dem Fall aufheben?';
+$lang->testtask->noticeNoOther     = 'Es existieren keine weiteren Testaufgaben für dieses Produkt';
+$lang->testtask->noTesttask        = 'Keine Testaufgaben. ';
+$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto       = "%s automated testing";
+$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateLess  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateMore  = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'Meine';
 $lang->testtask->allCases      = 'Alle Fälle';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 986c3d97ed..d0353b173d 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -127,17 +127,17 @@ $lang->testtask->fail          = 'Failed';
 $lang->testtask->showResult    = 'Run <span class="text-info">%s</span> times';
 $lang->testtask->showFail      = 'Failed <span class="text-danger">%s</span> times';
 
-$lang->testtask->confirmDelete      = 'Do you want to delete this build?';
-$lang->testtask->confirmUnlinkCase  = 'Do you want to unlink this case?';
-$lang->testtask->noticeNoOther      = 'No test builds for this product.';
-$lang->testtask->noTesttask         = 'No requests. ';
-$lang->testtask->checkLinked        = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
-$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto        = "%s automated testing";
-$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
-$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
+$lang->testtask->confirmDelete     = 'Do you want to delete this build?';
+$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
+$lang->testtask->noticeNoOther     = 'No test builds for this product.';
+$lang->testtask->noTesttask        = 'No requests. ';
+$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto       = "%s automated testing";
+$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateLess  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateMore  = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'AssignedToMe';
 $lang->testtask->allCases      = 'All Cases';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 06ed17d1a4..06c5692468 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -124,17 +124,17 @@ $lang->testtask->fail          = 'Echec';
 $lang->testtask->showResult    = 'Jouée <span class="text-info">%s</span> fois';
 $lang->testtask->showFail      = 'Echouée <span class="text-danger">%s</span> fois';
 
-$lang->testtask->confirmDelete      = 'Voulez-vous supprimer ce build ?';
-$lang->testtask->confirmUnlinkCase  = 'Voulez-vous détacher ce CasTest ?';
-$lang->testtask->noticeNoOther      = "Il n'y a pas de Campagnes de Recette pour ce product.";
-$lang->testtask->noTesttask         = 'Pas de campagne. ';
-$lang->testtask->checkLinked        = "Vérifiez si le product auquel la campagne de recette est associée est bien lié à un projet.";
-$lang->testtask->noImportData       = "Le XML importé ne parse pas les données.";
-$lang->testtask->unitXMLFormat      = 'Veuillez sélectionner un fichier au format XML JUnit.';
-$lang->testtask->titleOfAuto        = "%s tests automatisés";
-$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
-$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
+$lang->testtask->confirmDelete     = 'Voulez-vous supprimer ce build ?';
+$lang->testtask->confirmUnlinkCase = 'Voulez-vous détacher ce CasTest ?';
+$lang->testtask->noticeNoOther     = "Il n'y a pas de Campagnes de Recette pour ce product.";
+$lang->testtask->noTesttask        = 'Pas de campagne. ';
+$lang->testtask->checkLinked       = "Vérifiez si le product auquel la campagne de recette est associée est bien lié à un projet.";
+$lang->testtask->noImportData      = "Le XML importé ne parse pas les données.";
+$lang->testtask->unitXMLFormat     = 'Veuillez sélectionner un fichier au format XML JUnit.';
+$lang->testtask->titleOfAuto       = "%s tests automatisés";
+$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateLess  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateMore  = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe  = 'Affecté à Moi';
 $lang->testtask->allCases      = 'Tous les CasTests';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 2c5d58ab6c..500db063fd 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -124,17 +124,17 @@ $lang->testtask->fail          = 'Thất bại';
 $lang->testtask->showResult    = 'Chạy <span class="text-info">%s</span> lần';
 $lang->testtask->showFail      = 'Thất bại <span class="text-danger">%s</span> lần';
 
-$lang->testtask->confirmDelete      = 'Bạn có muốn xóa bản dựng này?';
-$lang->testtask->confirmUnlinkCase  = 'Bạn có muốn hủy liên kết tình huống này?';
-$lang->testtask->noticeNoOther      = 'Không có test builds cho sản phẩm này.';
-$lang->testtask->noTesttask         = 'Không có yêu cầu. ';
-$lang->testtask->checkLinked        = "Vui lòng kiểm tra sản phẩm đó mà yêu cầu test này là liên kết tới một dự án.";
-$lang->testtask->noImportData       = 'The imported XML does not parse the data.';
-$lang->testtask->unitXMLFormat      = 'Please select a file in JUnit XML format.';
-$lang->testtask->titleOfAuto        = "%s automated testing";
-$lang->testtask->cannotBeParsed     = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
-$lang->testtask->finishedDateError  = 'Actual Finished Date cannot be <= Begin Date %s';
-$lang->testtask->finishedDateError2 = 'Actual Finished Date cannot be > Today';
+$lang->testtask->confirmDelete     = 'Bạn có muốn xóa bản dựng này?';
+$lang->testtask->confirmUnlinkCase = 'Bạn có muốn hủy liên kết tình huống này?';
+$lang->testtask->noticeNoOther     = 'Không có test builds cho sản phẩm này.';
+$lang->testtask->noTesttask        = 'Không có yêu cầu. ';
+$lang->testtask->checkLinked       = "Vui lòng kiểm tra sản phẩm đó mà yêu cầu test này là liên kết tới một dự án.";
+$lang->testtask->noImportData      = 'The imported XML does not parse the data.';
+$lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
+$lang->testtask->titleOfAuto       = "%s automated testing";
+$lang->testtask->cannotBeParsed    = 'The content of the imported XML file is in the wrong format and cannot be parsed.';
+$lang->testtask->finishedDateLess  = 'Actual Finished Date cannot be <= Begin Date %s';
+$lang->testtask->finishedDateMore  = 'Actual Finished Date cannot be > Today';
 
 $lang->testtask->assignedToMe = 'Giao cho bạn';
 $lang->testtask->allCases     = 'Tất cả tình huống';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 6311af393b..81e431816c 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -127,17 +127,17 @@ $lang->testtask->fail          = '失败';
 $lang->testtask->showResult    = '共执行<span class="text-info">%s</span>次';
 $lang->testtask->showFail      = '失败<span class="text-danger">%s</span>次';
 
-$lang->testtask->confirmDelete      = '您确认要删除该测试单吗？';
-$lang->testtask->confirmUnlinkCase  = '您确认要移除该用例吗？';
-$lang->testtask->noticeNoOther      = '该产品还没有其他测试单';
-$lang->testtask->noTesttask         = '暂时没有测试单。';
-$lang->testtask->checkLinked        = "请检查测试单的产品是否与{$lang->executionCommon}相关联";
-$lang->testtask->noImportData       = '导入的XML没有解析出数据。';
-$lang->testtask->unitXMLFormat      = '请选择Junit XML 格式的文件。';
-$lang->testtask->titleOfAuto        = "%s 自动化测试";
-$lang->testtask->cannotBeParsed     = '导入的XML文件内容格式错误，无法解析。';
-$lang->testtask->finishedDateError  = '实际完成日期不能小于开始日期%s';
-$lang->testtask->finishedDateError2 = '实际完成日期不能大于今天';
+$lang->testtask->confirmDelete     = '您确认要删除该测试单吗？';
+$lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？';
+$lang->testtask->noticeNoOther     = '该产品还没有其他测试单';
+$lang->testtask->noTesttask        = '暂时没有测试单。';
+$lang->testtask->checkLinked       = "请检查测试单的产品是否与{$lang->executionCommon}相关联";
+$lang->testtask->noImportData      = '导入的XML没有解析出数据。';
+$lang->testtask->unitXMLFormat     = '请选择Junit XML 格式的文件。';
+$lang->testtask->titleOfAuto       = "%s 自动化测试";
+$lang->testtask->cannotBeParsed    = '导入的XML文件内容格式错误，无法解析。';
+$lang->testtask->finishedDateLess  = '实际完成日期不能小于开始日期%s';
+$lang->testtask->finishedDateMore  = '实际完成日期不能大于今天';
 
 $lang->testtask->assignedToMe  = '指派给我';
 $lang->testtask->allCases      = '所有用例';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 1af02fdb3d..38fb65d520 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -136,7 +136,8 @@ $lang->testtask->noImportData      = '導入的XML沒有解析出數據。';
 $lang->testtask->unitXMLFormat     = '請選擇Junit XML 格式的檔案。';
 $lang->testtask->titleOfAuto       = "%s 自動化測試";
 $lang->testtask->cannotBeParsed    = '導入的XML檔案內容格式錯誤，無法解析。';
-$lang->testtask->finishedDateError = '實際完成日期不能小於開始日期%s';
+$lang->testtask->finishedDateLess  = '實際完成日期不能小於開始日期%s';
+$lang->testtask->finishedDateMore  = '實際完成日期不能大於今天';
 
 $lang->testtask->assignedToMe  = '指派給我';
 $lang->testtask->allCases      = '所有用例';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6cffe05004..9c03081393 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -803,12 +803,12 @@ class testtaskModel extends model
 
         if($testtask->realFinishedDate <= $oldTesttask->begin)
         {
-            dao::$errors[] = sprintf($this->lang->testtask->finishedDateError, $oldTesttask->begin);
+            dao::$errors[] = sprintf($this->lang->testtask->finishedDateLess, $oldTesttask->begin);
             return false;
         }
         if($testtask->realFinishedDate > date("Y-m-d 00:00:00", strtotime("+1 day")))
         {
-            dao::$errors[] = $this->lang->testtask->finishedDateError2;
+            dao::$errors[] = $this->lang->testtask->finishedDateMore;
             return false;
         }
 

From 7aff97bb42242eb1b98ef44768389c204739f1e0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 15:32:49 +0800
Subject: [PATCH 28/28] * Fix bug #14987.

---
 module/execution/css/managemembers.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/css/managemembers.css b/module/execution/css/managemembers.css
index 113cd948de..9c4c327dc6 100644
--- a/module/execution/css/managemembers.css
+++ b/module/execution/css/managemembers.css
@@ -23,3 +23,4 @@
 
 .c-limited {width: 110px;}
 .c-actions {width: 90px;}
+.c-hours {width: 90px;}