From 3e05ffd786fcf60bbcf606cd8e3c18238a187c44 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Wed, 28 Sep 2022 18:10:58 +0800
Subject: [PATCH 01/42] * task #70007

---
 www/js/my.full.js           |  8 ++++----
 www/theme/default/style.css | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index dad5f587d5..eb48fe75d2 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -829,8 +829,8 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     if($parentTd.length == 0) return false;
 
     var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
-    var nameClass   = objectType == 'product' ? 'c-title'      : 'c-name';
-    $form.find('th.' + nameClass).append("<button type='button' id='toggleFold' class='btn btn-mini collapsed'>" + unfoldAll + "</button>");
+    var nameClass   = objectType == 'product' ? 'c-title' : 'c-name';
+    $form.find('th.' + nameClass).addClass('flex-between').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 
     var allUnfold = true;
     $parentTd.each(function()
@@ -843,7 +843,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
         $(this).find('a.' + toggleClass).addClass('collapsed')
     })
 
-    $form.find('th.' + nameClass + ' #toggleFold').html(allUnfold ? foldAll : unfoldAll).toggleClass('collapsed', !allUnfold);
+    $form.find('th.' + nameClass + ' #toggleFold').toggleClass('collapsed', !allUnfold);
 
     $(document).on('click', '#toggleFold', function()
     {
@@ -858,7 +858,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
             newUnfoldID.push(dataID);
         })
 
-        $(this).html(collapsed ? foldAll : unfoldAll).toggleClass('collapsed', !collapsed);
+        $(this).toggleClass('collapsed', !collapsed);
         url = createLink('misc', 'ajaxSetUnfoldID', 'objectID=' + objectID + '&objectType=' + objectType + '&action=' + (collapsed ? 'add' : 'delete'));
         $.post(url, {'newUnfoldID': JSON.stringify(newUnfoldID)});
     });
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index ffb8f774ab..68f74aa79f 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -118,11 +118,6 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #downloadMobile .dropdown-menu .mobile-version {text-align: center;}
 #downloadMobile .dropdown-menu .mobile-version span {color: #0c64eb; font-size: 12px; font-weight: 700;}
 
-/* #mainMenu > .btn-toolBar .btn-link .label-light,
-#mainMenu > .btn-toolbar .btn-link .label-light {color: #203362; background: #fff;}
-#mainMenu > .btn-toolBar .btn-active-text,
-#mainMenu > .btn-toolbar .btn-active-text {background: #E6EAF1;} */
-
 #programTableList > tr:hover {background: #E6F0FF; opacity: 0.8;}
 #programTableList > tr[data-type="project"] > .c-name:hover > a {color: #1E6AEB !important;}
 #programTableList > tr[data-type="project"] > .c-name > a {color: #2463c7 !important;}
@@ -131,3 +126,13 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #projectForm .c-name .label-danger,
 #executionTableList .c-name .label-danger,
 #programTableList .c-name .label-danger {position: absolute; right: 10px; padding: 2px 4px;}
+
+
+.flex-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+#toggleFold > .icon {display: inline-block; transition: transform .2s; transform: rotate(-90deg);}
+#toggleFold.collapsed > .icon {transform: rotate(90deg);}
+

From 3416fa60cd1177fa6805715922f70729b600b530 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 29 Sep 2022 08:48:20 +0800
Subject: [PATCH 02/42] * add toggle in myTaskForm

---
 module/my/js/task.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/my/js/task.js b/module/my/js/task.js
index 1a81c7de00..1a619e9755 100644
--- a/module/my/js/task.js
+++ b/module/my/js/task.js
@@ -10,7 +10,7 @@ $(function()
         e.stopPropagation();
         e.preventDefault();
     });
-
+    toggleFold('#myTaskForm', [], 0, 'my');
     $('#taskTable td.has-child .task-toggle').each(function()
     {
         var $td = $(this).closest('td');

From 502aeed83f4d8d872fd97943fdf733635874db31 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 29 Sep 2022 12:28:22 +0800
Subject: [PATCH 03/42] * add toggle in productPlan

---
 module/productplan/config.php                 | 1 +
 module/productplan/css/browse.css             | 1 +
 module/productplan/js/browse.js               | 1 +
 module/productplan/view/browsebylist.html.php | 3 +++
 www/js/my.full.js                             | 2 +-
 www/theme/default/style.css                   | 6 +-----
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/productplan/config.php b/module/productplan/config.php
index 9e7250f7e0..4dddb53677 100644
--- a/module/productplan/config.php
+++ b/module/productplan/config.php
@@ -19,6 +19,7 @@ $config->productplan->future = '2030-01-01';
 global $app, $lang;
 $app->loadLang('productplan');
 $config->productplan->search['module'] = 'productplan';
+$config->productplan->browse = new stdclass();
 
 $config->productplan->search['fields']['id']     = $lang->productplan->id;
 $config->productplan->search['fields']['title']  = $lang->productplan->title;
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index 1f9f589b44..db08509df3 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -35,3 +35,4 @@ td.c-branch {overflow: hidden; text-align: left !important; text-overflow: ellip
 .panel-actions {position: relative; padding: 0 0; padding-top: 1px;}
 .icon-list {padding-left: 7px;}
 .icon-kanban {padding-left: 7px; font-size: 16px;}
+#productplanList thead th.c-title {width: 100%;}
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index 181748c902..f91a60acac 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -11,6 +11,7 @@ $(document).on('click', '.task-toggle', function(e)
 
 $(function()
 {
+    toggleFold('#productplanForm', unfoldPlans, productID, 'product');
     $('#productplanList tbody tr').each(function()
     {
         var $content = $(this).find('td.content');
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index a046895e57..bc633b72e1 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -9,6 +9,9 @@
  * @link        https://www.zentao.net
  */
 ?>
+<?php $unfoldPlans = isset($config->productplan->browse->unfoldPlans) ? json_decode($config->productplan->browse->unfoldPlans, true) : array();?>
+<?php $unfoldPlans = zget($unfoldPlans, $productID, array());?>
+<?php js::set('unfoldPlans', $unfoldPlans);?>
 <style>
 .c-actions {width: 250px;}
 #productplanList .c-actions .btn+.btn {margin-left: -1px;}
diff --git a/www/js/my.full.js b/www/js/my.full.js
index eb48fe75d2..872e2abff8 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -878,7 +878,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
         setTimeout(function()
         {
             hasCollapsed = $table.find('td.has-child a.' + toggleClass + '.collapsed').length != 0;
-            $('#toggleFold').html(hasCollapsed ? unfoldAll : foldAll).toggleClass('collapsed', hasCollapsed);
+            $('#toggleFold').toggleClass('collapsed', hasCollapsed);
         }, 100);
 
         $.post(url, {'newUnfoldID': JSON.stringify(newUnfoldID)});
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 68f74aa79f..7f3eb77a16 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -128,11 +128,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #programTableList .c-name .label-danger {position: absolute; right: 10px; padding: 2px 4px;}
 
 
-.flex-between {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+.flex-between {display: flex;align-items: center;justify-content: space-between;}
 #toggleFold > .icon {display: inline-block; transition: transform .2s; transform: rotate(-90deg);}
 #toggleFold.collapsed > .icon {transform: rotate(90deg);}
 

From 859ec3368a6b127a57063ced68cffbbe216c4611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Thu, 29 Sep 2022 14:04:07 +0800
Subject: [PATCH 04/42] * Modify product plan unfloder style.

---
 module/misc/control.php                       | 5 +++++
 module/productplan/js/browse.js               | 2 +-
 module/productplan/view/browsebylist.html.php | 2 +-
 www/js/my.full.js                             | 5 +++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/module/misc/control.php b/module/misc/control.php
index 145eaf6616..b7fb0fe17b 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -256,6 +256,11 @@ class misc extends control
             $condition   = "owner={$account}&module={$objectType}&section=task&key=unfoldTasks";
             $settingPath = $account . ".{$objectType}.task.unfoldTasks";
         }
+        elseif($objectType == 'productplan')
+        {
+            $condition   = "owner={$account}&module={$objectType}&section=browse&key=unfoldPlans";
+            $settingPath = $account . ".{$objectType}.browse.unfoldPlans";
+        }
         else
         {
             $condition   = "owner={$account}&module=product&section=browse&key=unfoldStories";
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index f91a60acac..3a4bd7e776 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -11,7 +11,7 @@ $(document).on('click', '.task-toggle', function(e)
 
 $(function()
 {
-    toggleFold('#productplanForm', unfoldPlans, productID, 'product');
+    toggleFold('#productplanForm', unfoldPlans, productID, 'productplan');
     $('#productplanList tbody tr').each(function()
     {
         var $content = $(this).find('td.content');
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index bc633b72e1..1424d5a285 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -111,7 +111,7 @@
           $i++;
       }
       ?>
-      <tr class='<?php echo $class;?>'>
+      <tr class='<?php echo $class;?>' data-id="<?php echo $plan->id;?>">
         <td class='cell-id'>
           <?php if(common::hasPriv('productplan', 'batchEdit') or common::hasPriv('productplan', 'batchChangeStatus')):?>
           <?php echo html::checkbox('planIDList', array($plan->id => ''), '', $attribute) . html::a(helper::createLink('productplan', 'view', "planID=$plan->id"), sprintf('%03d', $plan->id));?>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 872e2abff8..efe2c194ea 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -828,8 +828,9 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     $parentTd = $form.find('td.has-child');
     if($parentTd.length == 0) return false;
 
-    var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
-    var nameClass   = objectType == 'product' ? 'c-title' : 'c-name';
+    var titleObject = ['product', 'productplan'];
+    var toggleClass = titleObject.indexOf(objectType) !== -1 ? 'story-toggle' : 'task-toggle';
+    var nameClass   = titleObject.indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
     $form.find('th.' + nameClass).addClass('flex-between').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 
     var allUnfold = true;

From 33b215ac39558028620ab00f53781013c26d2db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Thu, 29 Sep 2022 14:10:00 +0800
Subject: [PATCH 05/42] * Modify unfloder style.

---
 www/js/my.full.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index efe2c194ea..2fb33df782 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -828,9 +828,8 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     $parentTd = $form.find('td.has-child');
     if($parentTd.length == 0) return false;
 
-    var titleObject = ['product', 'productplan'];
-    var toggleClass = titleObject.indexOf(objectType) !== -1 ? 'story-toggle' : 'task-toggle';
-    var nameClass   = titleObject.indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
+    var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
+    var nameClass   = ['product', 'productplan'].indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
     $form.find('th.' + nameClass).addClass('flex-between').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 
     var allUnfold = true;

From 8cab82e6ff358d69c6a89dc195d71498a5890607 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Fri, 30 Sep 2022 09:51:23 +0800
Subject: [PATCH 06/42] * modify style

---
 module/my/css/task.css            | 2 +-
 module/productplan/css/browse.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/my/css/task.css b/module/my/css/task.css
index bb99a08527..4869f718b7 100644
--- a/module/my/css/task.css
+++ b/module/my/css/task.css
@@ -8,7 +8,7 @@ td.delayed {background: #e84e0f !important; color: white;}
 .table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .task-toggle > .icon:before {text-align: left;}
-.table td.has-child > .task-toggle.collapsed {top: 2px;}
+.table td.has-child > .task-toggle.collapsed {top: 0;}
 .table td.has-child > .task-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
 .table td.c-hours {padding-right: 12px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index e94c0f7212..aa23803872 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -10,7 +10,7 @@ td.c-branch {overflow: hidden; text-align: left !important; text-overflow: ellip
 .table td.has-child > .plan-name > .task-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .plan-name > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .plan-name > .task-toggle > .icon:before {text-align: left;}
-.table td.has-child > .plan-name > .task-toggle.collapsed {top: 2px;}
+.table td.has-child > .plan-name > .task-toggle.collapsed {top: 0;}
 .table td.has-child > .plan-name > .task-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}

From eae74e50fd4b2feb11a390b1f716b6496166d566 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Fri, 30 Sep 2022 15:26:21 +0800
Subject: [PATCH 07/42] * modify project execution table style

---
 module/project/css/execution.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/project/css/execution.css b/module/project/css/execution.css
index 41848ea166..da3af9736f 100644
--- a/module/project/css/execution.css
+++ b/module/project/css/execution.css
@@ -1,4 +1,4 @@
-#executionList > thead > tr > th .table-nest-toggle-global {top: 6px}
+#executionList > thead > tr > th .table-nest-toggle-global {top: 0;}
 #executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
 #executionsSummary {padding-left: 10px;}
 #mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
@@ -10,3 +10,6 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
 .c-date {text-align: center;}
 #executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;}
 #executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
+
+#executionTableList .table-nest-toggle:before,
+#executionTableList .table-nest-toggle:after {top: 9px;}
\ No newline at end of file

From e21fb874ed1d2027d121fd22ad5a99022fda32dc Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Sun, 9 Oct 2022 01:34:10 +0000
Subject: [PATCH 08/42] *Fix feedback #420.

---
 module/stage/model.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/module/stage/model.php b/module/stage/model.php
index 9baa81b443..a967e38b48 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -72,9 +72,9 @@ class stageModel extends model
                 ->batchCheck($this->config->stage->create->requiredFields, 'notempty')
                 ->checkIF($stage->percent != '', 'percent', 'float')
                 ->exec();
-            
-            if(dao::isError()) return false; 
-            
+
+            if(dao::isError()) return false;
+
             $stageID = $this->dao->lastInsertID();
             $this->action->create('stage', $stageID, 'Opened');
         }
@@ -117,13 +117,24 @@ class stageModel extends model
      * Get stages.
      *
      * @param  string $orderBy
+     * @param  int    $projectID
      * @access public
      * @return array
      */
-    public function getStages($orderBy = 'id_desc')
+    public function getStages($orderBy = 'id_desc', $projectID = 0)
     {
-        return $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->orderBy($orderBy)->fetchAll('id');
-    }
+        $stages = $this->dao->select('t1.id,name,type,percent,openedBy as createdBy,begin as createdDate,lastEditedBy as editedBy,end as editedDate,deleted')
+            ->from(TABLE_EXECUTION)->alias('t1')
+            ->where('t1.type')->in('sprint,stage,kanban')
+            ->andWhere('t1.deleted')->eq('0')
+            ->andWhere('t1.vision')->eq($this->config->vision)
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
+            ->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
+            ->orderBy($orderBy)
+            ->fetchAll('id');
+        $stages = !empty($stages) ? $stages : $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->orderBy($orderBy)->fetchAll('id');
+        return $stages;
+     }
 
     /**
      * Get pairs of stage.

From ca3a61f60577a979e1be2ac301db6f76bf1cb058 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 09:42:29 +0800
Subject: [PATCH 09/42] * finish task 71896

---
 module/execution/js/task.js                   | 2 +-
 module/execution/model.php                    | 2 +-
 module/my/view/story.html.php                 | 2 +-
 module/my/view/task.html.php                  | 2 +-
 module/productplan/view/browsebylist.html.php | 2 +-
 module/project/css/execution.css              | 8 +++-----
 module/story/model.php                        | 2 +-
 www/theme/default/style.css                   | 7 ++++++-
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/module/execution/js/task.js b/module/execution/js/task.js
index d66daf4a2f..ec899288f9 100644
--- a/module/execution/js/task.js
+++ b/module/execution/js/task.js
@@ -13,7 +13,7 @@ $(function()
 
     adjustTableFooter();
     $('body').on('click', '#toggleFold', adjustTableFooter);
-    $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter);
+    $('body').on('click', '.icon.icon-angle-right', adjustTableFooter);
 
     /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */
     $(".sidebar-toggle").click(function()
diff --git a/module/execution/model.php b/module/execution/model.php
index c8eb61f0ed..2665ba03b1 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4882,7 +4882,7 @@ class executionModel extends model
                 if(isset($execution->delay)) echo "<span class='label label-danger label-badge'>{$this->lang->execution->delayed}</span> ";
                 if(!empty($execution->children))
                 {
-                    echo "<a class='plan-toggle' data-id='$execution->id'><i class='icon icon-angle-double-right'></i></a>";
+                    echo "<a class='plan-toggle' data-id='$execution->id'><i class='icon icon-angle-right'></i></a>";
                 }
                 break;
             case 'code':
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index e9bb468757..4f79d72bdb 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -96,7 +96,7 @@
           <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td class='c-name nobr <?php if(!empty($story->children)) echo "has-child" ?>' title='<?php echo $story->title;?>'>
             <?php echo common::hasPriv('story', 'view') ? html::a($storyLink, $story->title, null, "style='color: $story->color' data-group='product'") : $story->title;?>
-            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';;?>
+            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';;?>
           </td>
           <td class='c-product' title='<?php echo $story->productTitle;?>'><?php echo $story->productTitle;?></td>
           <td class='c-plan'><?php echo $story->planTitle;?></td>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 289ab3f422..7584cc3ade 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -120,7 +120,7 @@
                   echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");
               }
               ?>
-              <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
+              <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-right"></i></a>';?>
             </td>
             <?php if($config->systemMode == 'new'):?>
             <?php $projectName = isset($projects[$task->execution]->name) ? $projects[$task->execution]->name : '';?>
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index ff9dbbdff4..425f8bf0a4 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -138,7 +138,7 @@
           if($plan->parent > 0) echo "<span class='label label-badge label-light' title='{$this->lang->productplan->children}'>{$this->lang->productplan->childrenAB}</span>";
           echo html::a(inlink('view', "id=$plan->id"), $plan->title);
           if(!empty($expired)) echo $expired;
-          if(isset($plan->children)) echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
+          if(isset($plan->children)) echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-right"></i></a>';
           echo '</div>';
           ?>
         </td>
diff --git a/module/project/css/execution.css b/module/project/css/execution.css
index da3af9736f..63419a4da2 100644
--- a/module/project/css/execution.css
+++ b/module/project/css/execution.css
@@ -1,4 +1,4 @@
-#executionList > thead > tr > th .table-nest-toggle-global {top: 0;}
+#executionList > thead > tr > th .table-nest-toggle-global {top: 4px;}
 #executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
 #executionsSummary {padding-left: 10px;}
 #mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
@@ -8,8 +8,6 @@ th.table-nest-title-edit {padding-left: 50px !important;}
 th.table-nest-title-edit .table-nest-toggle {left: 28px;}
 th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
 .c-date {text-align: center;}
+#executionTableList > tr.has-nest-child .table-nest-toggle {vertical-align: middle;}
 #executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;}
-#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
-
-#executionTableList .table-nest-toggle:before,
-#executionTableList .table-nest-toggle:after {top: 9px;}
\ No newline at end of file
+#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
\ No newline at end of file
diff --git a/module/story/model.php b/module/story/model.php
index 582808e2bf..1c478ff82e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4805,7 +4805,7 @@ class storyModel extends model
                 if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
                 if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
                 echo $canView ? html::a($storyLink, $story->title, '', "title='$story->title' style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";
-                if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';
+                if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';
                 break;
             case 'plan':
                 echo isset($story->planTitle) ? $story->planTitle : '';
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 02408d01c0..7a610a9341 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -136,7 +136,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #executionTableList .c-name .label-danger,
 
 .flex-between {display: flex;align-items: center;justify-content: space-between;}
-#toggleFold > .icon {display: inline-block; transition: transform .2s; transform: rotate(-90deg);}
+#toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);}
 #toggleFold.collapsed > .icon {transform: rotate(90deg);}
 
 #programTableList .c-name .label-danger {position: absolute; right: 4px; padding: 2px 4px;}
@@ -144,3 +144,8 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #projectForm .c-name,
 #executionTableList .c-name,
 #programTableList .c-name {padding-right: 64px;}
+
+.table .table-children,
+.table .is-nest-child {background: #F8F8F8;}
+
+.table tbody td.has-child .icon-angle-right {color: #838a9d;}
\ No newline at end of file

From 3f067a412e5b4f4dd1168dc10ded279748c97cc1 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 09:47:10 +0800
Subject: [PATCH 10/42] * remove empty lines

---
 www/theme/default/style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 7a610a9341..3e4dec2359 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -147,5 +147,4 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 
 .table .table-children,
 .table .is-nest-child {background: #F8F8F8;}
-
 .table tbody td.has-child .icon-angle-right {color: #838a9d;}
\ No newline at end of file

From ed225f525da8db9cd9936fdf17b9e29e2ad0777d Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 10:06:57 +0800
Subject: [PATCH 11/42] * finish task #71878

---
 module/execution/css/all.css           | 4 ++++
 module/execution/model.php             | 6 +++---
 module/project/view/execution.html.php | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 872a6e1219..104a5a8a92 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -38,3 +38,7 @@ canvas {height: 28px;}
 #datatable-executionList .table-child-bottom.table-child-top > .c-name.flex {border-bottom: 2px solid #cbd0db !important;}
 #datatable-executionList .parent.has-child.c-name.flex {border-bottom: 1px solid #cbd0db !important;}
 #datatable-executionList tr:last-child .c-name.flex {margin-top: 1px !important;}
+
+#executionList thead .c-estimate.text-right,
+#executionList thead .c-consumed.text-right,
+#executionList thead .c-left.text-right {padding-right: 8px;}
diff --git a/module/execution/model.php b/module/execution/model.php
index c8eb61f0ed..1137d00672 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4626,9 +4626,9 @@ class executionModel extends model
         echo '<td>' . html::ring($execution->hours->progress) . '</td>';
         echo helper::isZeroDate($execution->begin) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->begin . '</td>';
         echo helper::isZeroDate($execution->end) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->end . '</td>';
-        echo "<td class='hours' title='{$execution->hours->totalEstimate}{$this->lang->execution->workHour}'>" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . '</td>';
-        echo "<td class='hours' title='{$execution->hours->totalConsumed}{$this->lang->execution->workHour}'>" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . '</td>';
-        echo "<td class='hours' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td class='hours text-right' title='{$execution->hours->totalEstimate}{$this->lang->execution->workHour}'>" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td class='hours text-right' title='{$execution->hours->totalConsumed}{$this->lang->execution->workHour}'>" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . '</td>';
+        echo "<td class='hours text-right' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
         echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
         echo '<td class="c-actions">';
         common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index f63268a42f..5d2183a2a8 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -78,9 +78,9 @@
           <th class='c-hours'><?php echo $lang->project->progress;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>
           <th class='c-date'><?php echo $lang->programplan->end;?></th>
-          <th class='c-hours'><?php echo $lang->task->estimateAB;?></th>
-          <th class='c-hours'><?php echo $lang->task->consumedAB;?></th>
-          <th class='c-hours'><?php echo $lang->task->leftAB;?> </th>
+          <th class='c-hours text-right'><?php echo $lang->task->estimateAB;?></th>
+          <th class='c-hours text-right'><?php echo $lang->task->consumedAB;?></th>
+          <th class='c-hours text-right'><?php echo $lang->task->leftAB;?> </th>
           <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
           <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
         </tr>

From 54f94d95c02fed7524cd8aa64d45cd119db7d3a0 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 10:42:30 +0800
Subject: [PATCH 12/42] * finish task #71898

---
 module/common/lang/zh-cn.php |  2 +-
 module/common/lang/zh-tw.php |  2 +-
 module/my/view/task.html.php | 50 ++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a27488d59e..f601c2df79 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -146,7 +146,7 @@ $lang->workingHour = '工时';
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = '状态';
-$lang->openedByAB   = '创建';
+$lang->openedByAB   = '创建者';
 $lang->assignedToAB = '指派';
 $lang->typeAB       = '类型';
 $lang->nameAB       = '名称';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index efb472f9ac..5330154fde 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -136,7 +136,7 @@ $lang->workingHour = '工時';
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
 $lang->statusAB     = '狀態';
-$lang->openedByAB   = '創建';
+$lang->openedByAB   = '創建者';
 $lang->assignedToAB = '指派';
 $lang->typeAB       = '類型';
 $lang->nameAB       = '名稱';
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 289ab3f422..f0a9ae1b27 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -67,28 +67,28 @@
               <?php endif;?>
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
-            <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
             <th class='c-name'><?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
+            <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-status'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
             <?php if($config->systemMode == 'new'):?>
             <th class='c-project'><?php common::printOrderLink('project',   $orderBy, $vars, $lang->my->projects);?></th>
             <th class='c-project'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
             <?php else:?>
             <th class='c-project'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->my->executions);?></th>
             <?php endif;?>
+            <th class='c-date text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
+            <th class='c-hours estimate'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
+            <th class='c-hours consumed'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
+            <th class='c-hours'><?php common::printOrderLink('left',     $orderBy, $vars, $lang->task->leftAB);?></th>
             <?php if($type != 'openedBy'): ?>
             <th class='c-user-short'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
             <?php endif;?>
-            <th class='c-date text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
             <?php if($type != 'assignedTo'): ?>
             <th class='c-user assigned-title'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
             <?php endif;?>
             <?php if($type != 'finishedBy'): ?>
-            <th class='c-user'><?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedBy);?></th>
+            <th class='c-user'><?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
             <?php endif;?>
-            <th class='c-hours estimate'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
-            <th class='c-hours consumed'><?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
-            <th class='c-hours'><?php common::printOrderLink('left',     $orderBy, $vars, $lang->task->leftAB);?></th>
-            <th class='c-status'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
             <th class="c-actions-6 text-center"><?php echo $lang->actions;?></th>
           </tr>
         </thead>
@@ -105,7 +105,6 @@
               <?php endif;?>
               <?php printf('%03d', $task->id);?>
             </td>
-            <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
             <td class='c-name <?php if(!empty($task->children)) echo 'has-child';?>' title='<?php echo $task->name?>'>
               <?php if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
               <?php
@@ -122,6 +121,11 @@
               ?>
               <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
             </td>
+            <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
+            <td class='c-status'>
+              <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
+              <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
+            </td>
             <?php if($config->systemMode == 'new'):?>
             <?php $projectName = isset($projects[$task->execution]->name) ? $projects[$task->execution]->name : '';?>
             <?php $projectID   = isset($projects[$task->execution]->id) ? $projects[$task->execution]->id : 0;?>
@@ -130,23 +134,19 @@
             </td>
             <?php endif;?>
             <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?></td>
+            <td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
+            <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->estimate, 1) . $lang->execution->workHourUnit;?></td>
+            <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->consumed, 1) . $lang->execution->workHourUnit;?></td>
+            <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->left,     1) . $lang->execution->workHourUnit;?></td>
             <?php if($type != 'openedBy'): ?>
             <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
             <?php endif;?>
-            <td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
             <?php if($type != 'assignedTo'): ?>
             <td class="c-assignedTo has-btn" title="<?php echo zget($users, $task->assignedTo);?>"> <?php $this->task->printAssignedHtml($task, $users);?></td>
             <?php endif;?>
             <?php if($type != 'finishedBy'): ?>
             <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
             <?php endif;?>
-            <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->estimate, 1) . $lang->execution->workHourUnit;?></td>
-            <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->consumed, 1) . $lang->execution->workHourUnit;?></td>
-            <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($task->left,     1) . $lang->execution->workHourUnit;?></td>
-            <td class='c-status'>
-              <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
-              <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
-            </td>
             <td class='c-actions'>
               <?php
               if($canBeChanged)
@@ -194,11 +194,15 @@
                 <?php endif;?>
                 <?php printf('%03d', $child->id);?>
               </td>
-              <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $child->pri;?>' title='<?php echo zget($lang->task->priList, $child->pri);?>'><?php echo zget($lang->task->priList, $child->pri);?></span></td>
               <td class='c-name' title='<?php echo $child->name?>'>
                 <?php if($child->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
                 <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?>
               </td>
+              <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $child->pri;?>' title='<?php echo zget($lang->task->priList, $child->pri);?>'><?php echo zget($lang->task->priList, $child->pri);?></span></td>
+              <td class='c-status'>
+                <?php $storyChanged = (!empty($child->storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
+                <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$child->status}'> " . $this->processStatus('task', $child) . "</span>");?>
+              </td>
               <?php if($config->systemMode == 'new'):?>
               <?php $projectName = isset($projects[$child->execution]->name) ? $projects[$child->execution]->name : '';?>
               <?php $projectID   = isset($projects[$child->execution]->id) ? $projects[$child->execution]->id : 0;?>
@@ -207,23 +211,19 @@
               </td>
               <?php endif;?>
               <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?></td>
+              <td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?></td>
+              <td class='c-hours' title="<?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHourUnit;?></td>
+              <td class='c-hours' title="<?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHourUnit;?></td>
+              <td class='c-hours' title="<?php echo round($child->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->left,     1) . ' ' . $lang->execution->workHourUnit;?></td>
               <?php if($type != 'openedBy'): ?>
               <td class='c-user'><?php echo zget($users, $child->openedBy);?></td>
               <?php endif;?>
-              <td class="text-center <?php echo isset($child->delay) ? 'delayed' : '';?>"><?php if(substr($child->deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?></td>
               <?php if($type != 'assignedTo'): ?>
               <td class="c-assignedTo has-btn" title="<?php echo zget($users, $child->assignedTo);?>"> <?php $this->task->printAssignedHtml($child, $users);?></td>
               <?php endif;?>
               <?php if($type != 'finishedBy'): ?>
               <td class='c-user'><?php echo zget($users, $child->finishedBy);?></td>
               <?php endif;?>
-              <td class='c-hours' title="<?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->estimate, 1) . ' ' . $lang->execution->workHourUnit;?></td>
-              <td class='c-hours' title="<?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->consumed, 1) . ' ' . $lang->execution->workHourUnit;?></td>
-              <td class='c-hours' title="<?php echo round($child->left,     1) . ' ' . $lang->execution->workHour;?>"><?php echo round($child->left,     1) . ' ' . $lang->execution->workHourUnit;?></td>
-              <td class='c-status'>
-                <?php $storyChanged = (!empty($child->storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
-                <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$child->status}'> " . $this->processStatus('task', $child) . "</span>");?>
-              </td>
               <td class='c-actions'>
                 <?php
                 if($canBeChanged)

From 1d1ae03b958967d3eb098b62d7b4973c2c6461b7 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Sun, 9 Oct 2022 03:20:04 +0000
Subject: [PATCH 13/42] * The execution logic to which the update task belongs
 when it is newly created.

---
 module/task/control.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/module/task/control.php b/module/task/control.php
index 6b4220d7cd..6f198e7b8e 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -291,7 +291,22 @@ class task extends control
         /* Set Custom*/
         foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
 
-        $executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID, 'noclosed', 0, true);
+        $executionAll = array();
+        if(!empty($projectID))
+        {
+            $executionList = $this->execution->getByProject($projectID, 'noclosed', 0, true);
+            $project       = $this->loadModel('project')->getByID($projectID);
+            $replace       = substr(current($executionList), 0, strpos(current($executionList), '/'));
+            if(isset($project->model) and $project->model == 'waterfall')
+            {
+                foreach($executionList as $key => $val)
+                {
+                    $values      = str_replace($replace, $project->name, $val);
+                    $executionAll[$key] = $values;
+                }
+            }
+        }
+        $executions = $this->config->systemMode == 'classic' ? $executions : $executionAll;
 
         $testStoryIdList = $this->loadModel('story')->getTestStories(array_keys($stories), $execution->id);
         /* Stories that can be used to create test tasks. */

From 13135a581f5f632d6c85ed827d6b6a305ce50240 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Sun, 9 Oct 2022 05:28:58 +0000
Subject: [PATCH 14/42] * finish task 71882

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

diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index f9c967d68b..2956961e10 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -42,7 +42,7 @@
         <th class='c-status'><?php echo $lang->statusAB;?></th>
         <th class='c-user' title='<?php echo $lang->team->roleAB;?>'><?php echo $lang->team->roleAB;?></th>
         <th class='c-date'><?php echo $lang->team->join;?></th>
-        <th class='c-hours'><?php echo $lang->my->hours;?></th>
+        <th class='c-hours text-right'><?php echo $lang->my->hours;?></th>
         <th class='c-user text-center'><?php echo $lang->execution->myTask;?></th>
         <th class='c-progress'><?php echo $lang->execution->progress;?></th>
       </tr>
@@ -79,7 +79,7 @@
         </td>
         <td><?php echo $execution->role;?></td>
         <td class='c-date'><?php echo $execution->join;?></td>
-        <td><?php echo $execution->hours;?></td>
+        <td class="text-right"><?php echo $execution->hours;?></td>
         <td class="text-center"><?php echo $execution->assignedToMeTasks;?></td>
         <td>
           <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>

From 9aeba1938136c491ec2f8d21ab340ef3ed88a68f Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Sun, 9 Oct 2022 06:56:38 +0000
Subject: [PATCH 15/42] * add pd-r-8 to column c-hours th

---
 module/my/css/execution.css       | 1 +
 module/my/view/execution.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/my/css/execution.css b/module/my/css/execution.css
index 0c3f52f231..1e329cc330 100644
--- a/module/my/css/execution.css
+++ b/module/my/css/execution.css
@@ -1,2 +1,3 @@
 .c-hours, .c-progress {width: 80px !important;}
 .c-status, .c-date {padding-right: 8px !important; text-align: center;}
+.align-right {text-align: right; padding-right: 8px !important;}
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 2956961e10..0806d65d36 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -42,7 +42,7 @@
         <th class='c-status'><?php echo $lang->statusAB;?></th>
         <th class='c-user' title='<?php echo $lang->team->roleAB;?>'><?php echo $lang->team->roleAB;?></th>
         <th class='c-date'><?php echo $lang->team->join;?></th>
-        <th class='c-hours text-right'><?php echo $lang->my->hours;?></th>
+        <th class='c-hours align-right'><?php echo $lang->my->hours;?></th>
         <th class='c-user text-center'><?php echo $lang->execution->myTask;?></th>
         <th class='c-progress'><?php echo $lang->execution->progress;?></th>
       </tr>

From c5c38c98bf2b1b90ac1cf02953b28757f164bb6d Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 15:18:39 +0800
Subject: [PATCH 16/42] * modify style cover

---
 www/theme/default/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 3e4dec2359..b31be160e3 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -135,7 +135,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #projectForm .c-name .label-danger,
 #executionTableList .c-name .label-danger,
 
-.flex-between {display: flex;align-items: center;justify-content: space-between;}
+.flex-between {display: flex !important;align-items: center;justify-content: space-between;}
 #toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);}
 #toggleFold.collapsed > .icon {transform: rotate(90deg);}
 

From 6b59d194fbc2ad8610223a4466fa05e65099b732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 15:38:30 +0800
Subject: [PATCH 17/42] * Optimize product page.

---
 module/product/css/all.css       | 27 +++++++++++++++------------
 module/product/view/all.html.php |  1 +
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/module/product/css/all.css b/module/product/css/all.css
index c059f823c0..e95967bf35 100644
--- a/module/product/css/all.css
+++ b/module/product/css/all.css
@@ -35,7 +35,7 @@
 #programTree ul > li.has-list:after {width: 14px;}
 #programTree ul > li.item-meas a.selected {color: #0c64eb;}
 .side-col {padding-right: 20px; width: 18%;}
-#sidebar>.cell {width: 100%;}
+#sidebar > .cell {width: 100%;}
 
 th.c-name {width: 400px;}
 th.c-PO {width: 100px;}
@@ -44,15 +44,18 @@ th.c-bug {width: 150px;}
 th.c-plan {width: 45px;}
 th.c-release {width: 50px;}
 th.c-actions {width: 50px;}
+.c-name {border-left: none !important;}
+.icon-cards-view {color: #888fa1;}
 [lang='en'] .en-wrap-text {white-space: normal; height: 24px; line-height: 1; font-size: 12px;}
 
-#productListForm thead>tr>th,
-#productListForm tbody>tr>td {text-align: center; text-overflow: unset!important}
-#productListForm thead>tr>th {padding: 0; line-height: 24px;}
-#productListForm thead>tr:first-child>th {border-left: 1px solid #ddd;}
-#productListForm thead>tr>th.c-checkbox {border-left: none; padding-left: 15px; width: 45px;}
-#productListForm tbody>tr>td {padding: 2px 4px;}
-#productListForm tbody>tr>td:first-child {text-align: left; padding-left: 15px;}
+#productListForm thead > tr > th,
+#productListForm tbody > tr > td {text-align: center; text-overflow: unset!important}
+#productListForm thead > tr > th {padding: 0; line-height: 24px;}
+#productListForm thead > tr:first-child > th {border-left: 1px solid #ddd;}
+#productListForm thead > tr > th.c-checkbox {border-left: none; padding-left: 15px; width: 30px;}
+#productListForm tbody > tr > td {padding: 2px 4px;}
+#productListForm tbody > tr > td:first-child {text-align: left; padding-left: 15px;}
+#productListForm tbody > tr > td.table-nest-title {padding-left: 16px;}
 #productListForm th.table-nest-title .nest-has-checkbox {margin-top: 7px; margin-left: 35px;}
 #productListForm th.table-nest-title .nest-none-checkbox {margin-top: 8px; margin-left: 5px;}
 #productListForm th.table-nest-title .header {margin-left: 5px;}
@@ -61,11 +64,11 @@ th.c-actions {width: 50px;}
 #productListForm th.table-nest-title .table-nest-toggle {top: 14px; left: auto; right: 10px; opacity: .6;}
 #productListForm th.table-nest-title .table-nest-toggle::before {position: absolute; top: 0 !important; right: 0; bottom: 0; left: 0;}
 #productListForm th.table-nest-title .table-nest-toggle:hover {opacity: 1;}
-#productListForm .table.has-sort-head thead>tr>th>a:after,
-#productListForm .table.has-sort-head thead>tr>th>a:before {top: -3px;}
+#productListForm .table.has-sort-head thead > tr > th > a:after,
+#productListForm .table.has-sort-head thead > tr > th > a:before {top: -3px;}
 #productListForm .icon-product:before {content: '\e98f'; width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px;}
 #productTableList td.table-nest-title > span.icon.table-nest-toggle {vertical-align: middle;}
-#productList > thead th.table-nest-title.c-name {position: relative; padding-left: 4px !important;}
+#productList > thead th.table-nest-title.c-name {position: relative; padding-left: 16px !important;}
 
 @media screen and (max-width: 1460px)
 {
@@ -81,7 +84,7 @@ th.c-actions {width: 50px;}
 
 @media screen and (max-width: 1250px)
 {
-    #productListForm thead>tr>th {font-size: 12px;}
+    #productListForm thead > tr > th {font-size: 12px;}
     th.c-requirement {width: 265px;}
     th.c-story {width: 265px;}
     [lang^='zh-'] th.c-requirement {width: 220px;}
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 6a8079332a..42afe2436c 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -104,6 +104,7 @@
             <?php endif;?>
             <td class='text-left table-nest-title' title="<?php echo $program['programName']?>">
               <span class="table-nest-icon icon table-nest-toggle"></span>
+              &nbsp;<span class="icon icon-cards-view"></span>
               <span><?php echo $program['programName']?></span>
             </td>
             <td class='c-manager'>

From ec7844f035c5aa6f8220e3fe624d450c6b26133c Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 15:42:00 +0800
Subject: [PATCH 18/42] * compatible datatable style

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

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 104a5a8a92..1e883297a6 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -39,6 +39,6 @@ canvas {height: 28px;}
 #datatable-executionList .parent.has-child.c-name.flex {border-bottom: 1px solid #cbd0db !important;}
 #datatable-executionList tr:last-child .c-name.flex {margin-top: 1px !important;}
 
-#executionList thead .c-estimate.text-right,
-#executionList thead .c-consumed.text-right,
-#executionList thead .c-left.text-right {padding-right: 8px;}
+.table thead .c-estimate.text-right,
+.table thead .c-consumed.text-right,
+.table thead .c-left.text-right {padding-right: 8px;}

From b29d0f75c94fb6efc6964c90ecfbfa818b0d95cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 15:54:13 +0800
Subject: [PATCH 19/42] * Finish task #71894.

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

diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php
index ba5ef9ae03..1dfe1b58aa 100644
--- a/module/personnel/view/accessible.html.php
+++ b/module/personnel/view/accessible.html.php
@@ -37,10 +37,10 @@ js::set('deptID', $deptID);
         <thead>
           <tr>
             <th class="c-id"><?php echo $lang->idAB;?></th>
-            <th class="c-department"><?php echo $lang->personnel->department;?></th>
             <th class="c-user"><?php echo $lang->personnel->realName;?></th>
-            <th class="c-user"><?php echo $lang->personnel->userName;?></th>
+            <th class="c-department"><?php echo $lang->personnel->department;?></th>
             <th class="c-job"><?php echo $lang->personnel->job;?></th>
+            <th class="c-user"><?php echo $lang->personnel->userName;?></th>
             <th class="c-genders"><?php echo $lang->personnel->genders;?></th>
           </tr>
         </thead>
@@ -48,10 +48,10 @@ js::set('deptID', $deptID);
           <?php foreach($personnelList as $personnel):?>
           <tr>
             <td class="c-id"><?php echo $personnel->id;?></td>
-            <td class="c-name"><?php echo zget($deptList, $personnel->dept);?></td>
             <td class="c-name"><?php echo $personnel->realname;?></td>
-            <td class="c-name"><?php echo $personnel->account;?></td>
+            <td class="c-name"><?php echo zget($deptList, $personnel->dept);?></td>
             <td><?php echo zget($lang->user->roleList, $personnel->role, '');?></td>
+            <td class="c-name"><?php echo $personnel->account;?></td>
             <td><?php echo zget($lang->user->genderList, $personnel->gender, '');?></td>
           </tr>
           <?php endforeach;?>

From 205506a68a2bd0dbd1cd7fd0845ff6d61196fedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 16:14:17 +0800
Subject: [PATCH 20/42] * Finish task #71891.

---
 module/projectrelease/view/browse.html.php | 8 ++++----
 module/release/view/browse.html.php        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 36de8640c2..895fff64f2 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -46,11 +46,11 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
+        <th class='c-build'><?php echo $lang->release->build;?></th>
         <th class='c-product'><?php echo $lang->release->product;?></th>
         <th class='c-execution'><?php echo $lang->executionCommon;?></th>
-        <th class='c-build'><?php echo $lang->release->build;?></th>
-        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <th class='c-status text-center'><?php echo $lang->release->status;?></th>
+        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php
         $extendFields = $this->projectrelease->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
@@ -68,14 +68,14 @@
           echo html::a(inlink('view', "release=$release->id"), $release->name, '', "data-app='$from'") . $flagIcon;
           ?>
         </td>
+        <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
         <td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
         <td title='<?php echo $release->executionName?>'><?php echo $release->executionName?></td>
-        <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
-        <td class='text-center'><?php echo $release->date;?></td>
         <?php $status = $this->processStatus('release', $release);?>
         <td class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
         </td>
+        <td class='text-center'><?php echo $release->date;?></td>
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
         <td class='c-actions'><?php echo $this->projectrelease->buildOperateMenu($release, 'browse');?></td>
       </tr>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index cccf46cd3a..e116d6c677 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -48,13 +48,13 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
-        <th class="c-project"><?php echo $lang->release->project;?></th>
         <th class="c-build"><?php echo $lang->release->build;?></th>
         <?php if($product->type != 'normal'):?>
         <th class='text-center c-branch'><?php echo $lang->product->branch;?></th>
         <?php endif;?>
-        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
+        <th class="c-project"><?php echo $lang->release->project;?></th>
         <th class='text-center c-status'><?php echo $lang->release->status;?></th>
+        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php
         $extendFields = $this->release->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
@@ -73,16 +73,16 @@
           echo html::a(inlink('view', "release=$release->id"), $release->name, '', "title='$release->name'") . $flagIcon;
           ?>
         </td>
-        <td title='<?php echo $release->projectName?>'><?php echo $release->projectName;?></td>
         <td title='<?php echo $release->buildName?>'><?php echo empty($release->execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
         <?php if($product->type != 'normal'):?>
         <td class='text-center' title='<?php echo zget($branches, $release->branch, '');?>'><?php echo $branches[$release->branch];?></td>
         <?php endif;?>
-        <td class='text-center'><?php echo $release->date;?></td>
+        <td title='<?php echo $release->projectName?>'><?php echo $release->projectName;?></td>
         <?php $status = $this->processStatus('release', $release);?>
         <td class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
         </td>
+        <td class='text-center'><?php echo $release->date;?></td>
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
         <td class='c-actions'>
           <?php echo $this->release->buildOperateMenu($release, 'browse');?>

From 5306bb29f9b9dc6b0ecfab1e2a90cd95d7c8e1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 16:36:57 +0800
Subject: [PATCH 21/42] * Modify page style.

---
 module/program/model.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index ff55147f5a..6f75035472 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1532,11 +1532,11 @@ class programModel extends model
             if(common::hasPriv('program', 'suspend') || (common::hasPriv('program', 'close') && $program->status != 'doing') || (common::hasPriv('program', 'activate') && $program->status != 'closed'))
             {
                 $menu .= "<div class='btn-group'>";
-                $menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
-                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px 10px;'>";
-                $menu .= $this->buildMenu('program', 'suspend', $params, $program, $type, 'pause', '', 'iframe', true, '', $this->lang->program->suspend);
-                if($program->status != 'doing')  $menu .= $this->buildMenu('program', 'close',    $params, $program, $type, 'off', '',   'iframe', true);
-                if($program->status != 'closed') $menu .= $this->buildMenu('program', 'activate', $params, $program, $type, 'magic', '', 'iframe', true);
+                $menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
+                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                $menu .= $this->buildMenu('program', 'suspend', $params, $program, $type, 'pause', '', 'iframe btn-action btn', true, '', $this->lang->program->suspend);
+                if($program->status != 'doing')  $menu .= $this->buildMenu('program', 'close',    $params, $program, $type, 'off', '',   'iframe btn-action btn', true);
+                if($program->status != 'closed') $menu .= $this->buildMenu('program', 'activate', $params, $program, $type, 'magic', '', 'iframe btn-action btn', true);
                 $menu .= "</ul>";
                 $menu .= "</div>";
             }
@@ -1560,11 +1560,11 @@ class programModel extends model
             if(common::hasPriv('project', 'suspend') || (common::hasPriv('project', 'close') && $program->status != 'doing') || (common::hasPriv('project', 'activate') && $program->status != 'closed'))
             {
                 $menu .= "<div class='btn-group'>";
-                $menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
-                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px 10px;'>";
-                $menu .= $this->buildMenu('project', 'suspend', $params, $program, $type, 'pause', '', 'iframe', true);
-                if($program->status != 'doing')  $menu .= $this->buildMenu('project', 'close',    $params, $program, $type, 'off',   '', 'iframe', true);
-                if($program->status != 'closed') $menu .= $this->buildMenu('project', 'activate', $params, $program, $type, 'magic', '', 'iframe', true);
+                $menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
+                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                $menu .= $this->buildMenu('project', 'suspend', $params, $program, $type, 'pause', '', 'iframe btn-action btn', true);
+                if($program->status != 'doing')  $menu .= $this->buildMenu('project', 'close',    $params, $program, $type, 'off',   '', 'iframe btn-action btn', true);
+                if($program->status != 'closed') $menu .= $this->buildMenu('project', 'activate', $params, $program, $type, 'magic', '', 'iframe btn-action btn', true);
                 $menu .= "</ul>";
                 $menu .= "</div>";
             }

From 3523d0b2552e8c8f38571034e9d7b7d2917c2943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 17:01:01 +0800
Subject: [PATCH 22/42] * Finish task #71892.

---
 module/projectrelease/js/browse.js         | 26 +++++++++
 module/projectrelease/view/browse.html.php | 10 +++-
 module/release/js/browse.js                | 26 +++++++++
 module/release/lang/de.php                 | 64 +++++++++++-----------
 module/release/lang/en.php                 | 64 +++++++++++-----------
 module/release/lang/fr.php                 | 64 +++++++++++-----------
 module/release/lang/zh-cn.php              | 64 +++++++++++-----------
 module/release/view/browse.html.php        |  6 +-
 8 files changed, 197 insertions(+), 127 deletions(-)
 create mode 100644 module/projectrelease/js/browse.js
 create mode 100644 module/release/js/browse.js

diff --git a/module/projectrelease/js/browse.js b/module/projectrelease/js/browse.js
new file mode 100644
index 0000000000..215487f727
--- /dev/null
+++ b/module/projectrelease/js/browse.js
@@ -0,0 +1,26 @@
+$(function()
+{
+    /* Update table summary text. */
+    var $rows  = $('#releaseList').find('tbody>tr');
+
+    var normal    = 0;
+    var terminate = 0;
+    $rows.each(function()
+    {
+        var $row = $(this);
+        var data = $row.data();
+        if(data.type === 'normal') normal++;
+        if(data.type === 'terminate') terminate++;
+    });
+
+    var summary = '';
+    if(type != 'all')
+    {
+        summary =  pageSummary.replace('%s', $rows.length);
+    }
+    else
+    {
+        summary = pageAllSummary.replace('%total%', $rows.length).replace('%normal%', normal).replace('%terminate%', terminate);
+    }
+    $('.table-statistic').html(summary);
+});
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 895fff64f2..24075caf0b 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -13,6 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
+<?php js::set('pageAllSummary', $lang->release->pageAllSummary)?>
+<?php js::set('pageSummary', $lang->release->pageSummary)?>
+<?php js::set('type', $type)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
@@ -60,7 +63,7 @@
     </thead>
     <tbody>
       <?php foreach($releases as $release):?>
-      <tr>
+      <tr data-type='<?php echo $release->status;?>'>
         <td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td>
           <?php
@@ -82,7 +85,10 @@
       <?php endforeach;?>
     </tbody>
   </table>
-  <div class='table-footer'><?php echo $pager->show('left', 'pagerjs');?></div>
+  <div class='table-footer'>
+    <div class="table-statistic"></div>
+    <?php echo $pager->show('left', 'pagerjs');?>
+  </div>
   <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/release/js/browse.js b/module/release/js/browse.js
new file mode 100644
index 0000000000..215487f727
--- /dev/null
+++ b/module/release/js/browse.js
@@ -0,0 +1,26 @@
+$(function()
+{
+    /* Update table summary text. */
+    var $rows  = $('#releaseList').find('tbody>tr');
+
+    var normal    = 0;
+    var terminate = 0;
+    $rows.each(function()
+    {
+        var $row = $(this);
+        var data = $row.data();
+        if(data.type === 'normal') normal++;
+        if(data.type === 'terminate') terminate++;
+    });
+
+    var summary = '';
+    if(type != 'all')
+    {
+        summary =  pageSummary.replace('%s', $rows.length);
+    }
+    else
+    {
+        summary = pageAllSummary.replace('%total%', $rows.length).replace('%normal%', normal).replace('%terminate%', terminate);
+    }
+    $('.table-statistic').html(summary);
+});
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index d2e7ef5f37..8300c5d5fc 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -33,37 +33,39 @@ $lang->release->errorDate          = 'The release date should not be greater tha
 
 $lang->release->basicInfo = 'Basis Info';
 
-$lang->release->id            = 'ID';
-$lang->release->product       = $lang->productCommon;
-$lang->release->branch        = 'Platform/Branch';
-$lang->release->project       = 'Project';
-$lang->release->build         = 'Build';
-$lang->release->name          = 'Name';
-$lang->release->marker        = 'Meilensteine';
-$lang->release->date          = 'Datum';
-$lang->release->desc          = 'Beschreibung';
-$lang->release->files         = 'Gehäuse';
-$lang->release->status        = 'Status';
-$lang->release->subStatus     = 'Sub Status';
-$lang->release->last          = 'Letztes Release';
-$lang->release->unlinkStory   = 'Story entfernen';
-$lang->release->unlinkBug     = 'Bug entfernen';
-$lang->release->stories       = 'Abgeschlossene Story';
-$lang->release->bugs          = 'Gelöste Bugs';
-$lang->release->leftBugs      = 'Verbleibende Bugs';
-$lang->release->generatedBugs = 'Gemeldete Bugs';
-$lang->release->finishStories = 'Abgeschlossene %s Storys';
-$lang->release->resolvedBugs  = 'Gelöste %s Bugs';
-$lang->release->createdBugs   = 'Erstellte %s Bugs';
-$lang->release->export        = 'Export as HTML';
-$lang->release->yesterday     = 'Gestern veröffentlicht';
-$lang->release->all           = 'All';
-$lang->release->notify        = 'Notify';
-$lang->release->notifyUsers   = 'Notify Users';
-$lang->release->mailto        = 'Mailto';
-$lang->release->mailContent   = '<p>Dear users,</p><p style="margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
-$lang->release->storyList     = '<p style="margin-left: 30px;">Story List：%s。</p>';
-$lang->release->bugList       = '<p style="margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->id             = 'ID';
+$lang->release->product        = $lang->productCommon;
+$lang->release->branch         = 'Platform/Branch';
+$lang->release->project        = 'Project';
+$lang->release->build          = 'Build';
+$lang->release->name           = 'Name';
+$lang->release->marker         = 'Meilensteine';
+$lang->release->date           = 'Datum';
+$lang->release->desc           = 'Beschreibung';
+$lang->release->files          = 'Gehäuse';
+$lang->release->status         = 'Status';
+$lang->release->subStatus      = 'Sub Status';
+$lang->release->last           = 'Letztes Release';
+$lang->release->unlinkStory    = 'Story entfernen';
+$lang->release->unlinkBug      = 'Bug entfernen';
+$lang->release->stories        = 'Abgeschlossene Story';
+$lang->release->bugs           = 'Gelöste Bugs';
+$lang->release->leftBugs       = 'Verbleibende Bugs';
+$lang->release->generatedBugs  = 'Gemeldete Bugs';
+$lang->release->finishStories  = 'Abgeschlossene %s Storys';
+$lang->release->resolvedBugs   = 'Gelöste %s Bugs';
+$lang->release->createdBugs    = 'Erstellte %s Bugs';
+$lang->release->export         = 'Export as HTML';
+$lang->release->yesterday      = 'Gestern veröffentlicht';
+$lang->release->all            = 'All';
+$lang->release->notify         = 'Notify';
+$lang->release->notifyUsers    = 'Notify Users';
+$lang->release->mailto         = 'Mailto';
+$lang->release->mailContent    = '<p>Dear users,</p><p style="margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
+$lang->release->storyList      = '<p style="margin-left: 30px;">Story List：%s。</p>';
+$lang->release->bugList        = '<p style="margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->pageAllSummary = 'Total releases: <strong>%total%</strong>, Normal: <strong>%normal%</strong>, Terminate: <strong>%terminate%</strong>。';
+$lang->release->pageSummary    = "Total releases: <strong>%s</strong>.";
 
 $lang->release->storyTitle = 'Story Name';
 $lang->release->bugTitle   = 'Bug Name';
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 51bda2c5e6..0970f52afe 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -33,37 +33,39 @@ $lang->release->errorDate          = 'The release date should not be greater tha
 
 $lang->release->basicInfo = 'Basic Info';
 
-$lang->release->id            = 'ID';
-$lang->release->product       = $lang->productCommon;
-$lang->release->branch        = 'Platform/Branch';
-$lang->release->project       = 'Project';
-$lang->release->build         = 'Build';
-$lang->release->name          = 'Name';
-$lang->release->marker        = 'Milestone';
-$lang->release->date          = 'Release Date';
-$lang->release->desc          = 'Description';
-$lang->release->files         = 'Files';
-$lang->release->status        = 'Status';
-$lang->release->subStatus     = 'Sub Status';
-$lang->release->last          = 'Last Release';
-$lang->release->unlinkStory   = 'Unlink Story';
-$lang->release->unlinkBug     = 'Unlink Bug';
-$lang->release->stories       = 'Finished Story';
-$lang->release->bugs          = 'Resolved Bug';
-$lang->release->leftBugs      = 'Active Bug';
-$lang->release->generatedBugs = 'Active Bug';
-$lang->release->finishStories = 'Finished %s Stories';
-$lang->release->resolvedBugs  = 'Resolved %s Bugs';
-$lang->release->createdBugs   = 'Unresolved %s Bug';
-$lang->release->export        = 'Export as HTML';
-$lang->release->yesterday     = 'Released Yesterday';
-$lang->release->all           = 'All';
-$lang->release->notify        = 'Notify';
-$lang->release->notifyUsers   = 'Notify Users';
-$lang->release->mailto        = 'Mailto';
-$lang->release->mailContent   = '<p>Dear users,</p><p style="margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
-$lang->release->storyList     = '<p style="margin-left: 30px;">Story List：%s。</p>';
-$lang->release->bugList       = '<p style="margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->id             = 'ID';
+$lang->release->product        = $lang->productCommon;
+$lang->release->branch         = 'Platform/Branch';
+$lang->release->project        = 'Project';
+$lang->release->build          = 'Build';
+$lang->release->name           = 'Name';
+$lang->release->marker         = 'Milestone';
+$lang->release->date           = 'Release Date';
+$lang->release->desc           = 'Description';
+$lang->release->files          = 'Files';
+$lang->release->status         = 'Status';
+$lang->release->subStatus      = 'Sub Status';
+$lang->release->last           = 'Last Release';
+$lang->release->unlinkStory    = 'Unlink Story';
+$lang->release->unlinkBug      = 'Unlink Bug';
+$lang->release->stories        = 'Finished Story';
+$lang->release->bugs           = 'Resolved Bug';
+$lang->release->leftBugs       = 'Active Bug';
+$lang->release->generatedBugs  = 'Active Bug';
+$lang->release->finishStories  = 'Finished %s Stories';
+$lang->release->resolvedBugs   = 'Resolved %s Bugs';
+$lang->release->createdBugs    = 'Unresolved %s Bug';
+$lang->release->export         = 'Export as HTML';
+$lang->release->yesterday      = 'Released Yesterday';
+$lang->release->all            = 'All';
+$lang->release->notify         = 'Notify';
+$lang->release->notifyUsers    = 'Notify Users';
+$lang->release->mailto         = 'Mailto';
+$lang->release->mailContent    = '<p>Dear users,</p><p style                                                                                               = "margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
+$lang->release->storyList      = '<p style                                                                                                                 = "margin-left: 30px;">Story List：%s。</p>';
+$lang->release->bugList        = '<p style                                                                                                                 = "margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->pageAllSummary = 'Total releases: <strong>%total%</strong>, Normal: <strong>%normal%</strong>, Terminate: <strong>%terminate%</strong>。';
+$lang->release->pageSummary    = "Total releases: <strong>%s</strong>.";
 
 $lang->release->storyTitle = 'Story Name';
 $lang->release->bugTitle   = 'Bug Name';
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index ec8a2860ef..290c323c5d 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -33,37 +33,39 @@ $lang->release->errorDate          = "La date de release ne doit pas être supé
 
 $lang->release->basicInfo = 'Infos de Base';
 
-$lang->release->id            = 'ID';
-$lang->release->product       = $lang->productCommon;
-$lang->release->branch        = 'Plateforme/Branche';
-$lang->release->project       = 'Project';
-$lang->release->build         = 'Build';
-$lang->release->name          = 'Nom';
-$lang->release->marker        = 'Etape Importante';
-$lang->release->date          = 'Date Release';
-$lang->release->desc          = 'Description';
-$lang->release->files         = 'Files';
-$lang->release->status        = 'Statut';
-$lang->release->subStatus     = 'Sous-statut';
-$lang->release->last          = 'Dernière Release';
-$lang->release->unlinkStory   = 'Retirer Story';
-$lang->release->unlinkBug     = 'Retirer Bug';
-$lang->release->stories       = 'Stories Terminées';
-$lang->release->bugs          = 'Bugs Résolus';
-$lang->release->leftBugs      = 'Bugs Actifs';
-$lang->release->generatedBugs = 'Bugs Actifs';
-$lang->release->finishStories = '%s Stories Terminées';
-$lang->release->resolvedBugs  = '%s Bugs Résolus';
-$lang->release->createdBugs   = '%s Bugs non résolus';
-$lang->release->export        = 'Export HTML';
-$lang->release->yesterday     = 'Versionné Hier';
-$lang->release->all           = 'Tout';
-$lang->release->notify        = 'Notify';
-$lang->release->notifyUsers   = 'Notify Users';
-$lang->release->mailto        = 'Mailto';
-$lang->release->mailContent   = '<p>Dear users,</p><p style="margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
-$lang->release->storyList     = '<p style="margin-left: 30px;">Story List：%s。</p>';
-$lang->release->bugList       = '<p style="margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->id             = 'ID';
+$lang->release->product        = $lang->productCommon;
+$lang->release->branch         = 'Plateforme/Branche';
+$lang->release->project        = 'Project';
+$lang->release->build          = 'Build';
+$lang->release->name           = 'Nom';
+$lang->release->marker         = 'Etape Importante';
+$lang->release->date           = 'Date Release';
+$lang->release->desc           = 'Description';
+$lang->release->files          = 'Files';
+$lang->release->status         = 'Statut';
+$lang->release->subStatus      = 'Sous-statut';
+$lang->release->last           = 'Dernière Release';
+$lang->release->unlinkStory    = 'Retirer Story';
+$lang->release->unlinkBug      = 'Retirer Bug';
+$lang->release->stories        = 'Stories Terminées';
+$lang->release->bugs           = 'Bugs Résolus';
+$lang->release->leftBugs       = 'Bugs Actifs';
+$lang->release->generatedBugs  = 'Bugs Actifs';
+$lang->release->finishStories  = '%s Stories Terminées';
+$lang->release->resolvedBugs   = '%s Bugs Résolus';
+$lang->release->createdBugs    = '%s Bugs non résolus';
+$lang->release->export         = 'Export HTML';
+$lang->release->yesterday      = 'Versionné Hier';
+$lang->release->all            = 'Tout';
+$lang->release->notify         = 'Notify';
+$lang->release->notifyUsers    = 'Notify Users';
+$lang->release->mailto         = 'Mailto';
+$lang->release->mailContent    = '<p>Dear users,</p><p style                                                                                               = "margin-left: 30px;">The following requirements and bugs you feedback have been released in the %s. Please contact your account manager to check the latest version.</p>';
+$lang->release->storyList      = '<p style                                                                                                                 = "margin-left: 30px;">Story List：%s。</p>';
+$lang->release->bugList        = '<p style                                                                                                                 = "margin-left: 30px;">Bug List：%s。</p>';
+$lang->release->pageAllSummary = 'Total releases: <strong>%total%</strong>, Normal: <strong>%normal%</strong>, Terminate: <strong>%terminate%</strong>。';
+$lang->release->pageSummary    = "Total releases: <strong>%s</strong>.";
 
 $lang->release->storyTitle = 'Story Name';
 $lang->release->bugTitle   = 'Bug Name';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index d76ce29615..9f4d18fa33 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -33,37 +33,39 @@ $lang->release->errorDate          = '发布日期不能大于今天。';
 
 $lang->release->basicInfo = '基本信息';
 
-$lang->release->id            = 'ID';
-$lang->release->product       = $lang->productCommon;
-$lang->release->branch        = '平台/分支';
-$lang->release->project       = '所属项目';
-$lang->release->build         = '版本';
-$lang->release->name          = '发布名称';
-$lang->release->marker        = '里程碑';
-$lang->release->date          = '发布日期';
-$lang->release->desc          = '描述';
-$lang->release->files         = '附件';
-$lang->release->status        = '状态';
-$lang->release->subStatus     = '子状态';
-$lang->release->last          = '上次发布';
-$lang->release->unlinkStory   = "移除{$lang->SRCommon}";
-$lang->release->unlinkBug     = '移除Bug';
-$lang->release->stories       = "完成的{$lang->SRCommon}";
-$lang->release->bugs          = '解决的Bug';
-$lang->release->leftBugs      = '遗留的Bug';
-$lang->release->generatedBugs = '遗留的Bug';
-$lang->release->finishStories = "本次共完成 %s 个{$lang->SRCommon}";
-$lang->release->resolvedBugs  = '本次共解决 %s 个Bug';
-$lang->release->createdBugs   = '本次共遗留 %s 个Bug';
-$lang->release->export        = '导出HTML';
-$lang->release->yesterday     = '昨日发布';
-$lang->release->all           = '所有';
-$lang->release->notify        = '发送通知';
-$lang->release->notifyUsers   = '通知人员';
-$lang->release->mailto        = '抄送给';
-$lang->release->mailContent   = '<p>尊敬的用户，您好！</p><p style="margin-left: 30px;">您反馈的如下需求和Bug已经在 %s版本中发布，请联系客户经理查看最新版本。</p>';
-$lang->release->storyList     = '<p style="margin-left: 30px;">需求列表：%s。</p>';
-$lang->release->bugList       = '<p style="margin-left: 30px;">Bug列表：%s。</p>';
+$lang->release->id             = 'ID';
+$lang->release->product        = $lang->productCommon;
+$lang->release->branch         = '平台/分支';
+$lang->release->project        = '所属项目';
+$lang->release->build          = '版本';
+$lang->release->name           = '发布名称';
+$lang->release->marker         = '里程碑';
+$lang->release->date           = '发布日期';
+$lang->release->desc           = '描述';
+$lang->release->files          = '附件';
+$lang->release->status         = '状态';
+$lang->release->subStatus      = '子状态';
+$lang->release->last           = '上次发布';
+$lang->release->unlinkStory    = "移除{$lang->SRCommon}";
+$lang->release->unlinkBug      = '移除Bug';
+$lang->release->stories        = "完成的{$lang->SRCommon}";
+$lang->release->bugs           = '解决的Bug';
+$lang->release->leftBugs       = '遗留的Bug';
+$lang->release->generatedBugs  = '遗留的Bug';
+$lang->release->finishStories  = "本次共完成 %s 个{$lang->SRCommon}";
+$lang->release->resolvedBugs   = '本次共解决 %s 个Bug';
+$lang->release->createdBugs    = '本次共遗留 %s 个Bug';
+$lang->release->export         = '导出HTML';
+$lang->release->yesterday      = '昨日发布';
+$lang->release->all            = '所有';
+$lang->release->notify         = '发送通知';
+$lang->release->notifyUsers    = '通知人员';
+$lang->release->mailto         = '抄送给';
+$lang->release->mailContent    = '<p>尊敬的用户，您好！</p><p style="margin-left: 30px;">您反馈的如下需求和Bug已经在 %s版本中发布，请联系客户经理查看最新版本。</p>';
+$lang->release->storyList      = '<p style="margin-left: 30px;">需求列表：%s。</p>';
+$lang->release->bugList        = '<p style="margin-left: 30px;">Bug列表：%s。</p>';
+$lang->release->pageAllSummary = '本页共 <strong>%total%</strong> 个发布，正常 <strong>%normal%</strong>，停止维护 <strong>%terminate%</strong>。';
+$lang->release->pageSummary    = "本页共 <strong>%s</strong> 个发布。";
 
 $lang->release->storyTitle = '需求名称';
 $lang->release->bugTitle   = 'Bug名称';
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index e116d6c677..d8e18d56f6 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -13,6 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
+<?php js::set('pageAllSummary', $lang->release->pageAllSummary)?>
+<?php js::set('pageSummary', $lang->release->pageSummary)?>
+<?php js::set('type', $type)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
@@ -65,7 +68,7 @@
     <tbody>
       <?php foreach($releases as $release):?>
       <?php $canBeChanged = common::canBeChanged('release', $release);?>
-      <tr>
+      <tr data-type='<?php echo $release->status;?>'>
         <td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td>
           <?php
@@ -92,6 +95,7 @@
     </tbody>
   </table>
   <div class='table-footer'>
+    <div class="table-statistic"></div>
     <?php $pager->show('right', 'pagerjs');?>
   </div>
   <?php endif;?>

From f559785539787988e707fa58fd8e89f1eff8b63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Sun, 9 Oct 2022 17:08:21 +0800
Subject: [PATCH 23/42] * Optimize page style.

---
 module/product/css/all.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/product/css/all.css b/module/product/css/all.css
index e95967bf35..75d47f016c 100644
--- a/module/product/css/all.css
+++ b/module/product/css/all.css
@@ -68,6 +68,7 @@ th.c-actions {width: 50px;}
 #productListForm .table.has-sort-head thead > tr > th > a:before {top: -3px;}
 #productListForm .icon-product:before {content: '\e98f'; width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px;}
 #productTableList td.table-nest-title > span.icon.table-nest-toggle {vertical-align: middle;}
+#productTableList > tr[data-nest-parent] {background: #f8f8f8;}
 #productList > thead th.table-nest-title.c-name {position: relative; padding-left: 16px !important;}
 
 @media screen and (max-width: 1460px)

From 6ea3c948a5b99a92037de5dd753632d9e1e19b3c Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Sun, 9 Oct 2022 17:23:05 +0800
Subject: [PATCH 24/42] * finish task #71897

---
 module/testsuite/control.php          | 15 +++++++++++++++
 module/testsuite/lang/de.php          |  1 +
 module/testsuite/lang/en.php          |  1 +
 module/testsuite/lang/fr.php          |  1 +
 module/testsuite/lang/vi.php          |  1 +
 module/testsuite/lang/zh-cn.php       |  1 +
 module/testsuite/lang/zh-tw.php       |  2 ++
 module/testsuite/view/browse.html.php |  5 ++++-
 8 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index f1db7cad12..7877cd34bf 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -81,6 +81,20 @@ class testsuite extends control
             $pager  = pager::init(0, $recPerPage, 1);
             $suites = $this->testsuite->getSuites($productID, $sort, $pager, $type);
         }
+        $privateSuites = array();
+        foreach($suites as $suiteItem)
+        {
+            $item = new stdclass();
+            $item = $suiteItem;
+            if($suiteItem->type == 'private')
+            {
+                $privateSuites[] = $item;
+            }
+        }
+        $suitesNum         = !empty(count($suites, 0)) ? count($suites, 0) : 0;
+        $privateNum        = !empty(count($privateSuites, 0)) ? count($privateSuites, 0) : 0;
+        $publicNum         = $suitesNum - $privateNum;
+        $summary           = str_replace(array('%total%', '%public%', '%private%'), array($suitesNum, $publicNum, $privateNum), $this->lang->testsuite->summary);
 
         $this->view->title       = $productName . $this->lang->testsuite->common;
         $this->view->position[]  = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $productName);
@@ -94,6 +108,7 @@ class testsuite extends control
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->pager       = $pager;
         $this->view->product     = $this->product->getByID($productID);
+        $this->view->summary     = $summary;
 
         $this->display();
     }
diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index 87f5b051b0..d55cb07b14 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -56,3 +56,4 @@ $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
+$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index ad27dd4346..8ef30931ca 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -56,3 +56,4 @@ $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
+$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index 40d8c6b906..ec426e9128 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -56,3 +56,4 @@ $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
+$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/vi.php b/module/testsuite/lang/vi.php
index f262b8932f..ca83b65da7 100644
--- a/module/testsuite/lang/vi.php
+++ b/module/testsuite/lang/vi.php
@@ -53,3 +53,4 @@ $lang->testsuite->authorList['private'] = 'Riêng tư';
 $lang->testsuite->authorList['public']  = 'Công khai';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
+$lang->testsuite->summary                     = "Tổng <strong>%total%</strong> suites nào, Công khai <strong>%public%</strong>, Riêng tư <strong>%private%</strong>.";
\ No newline at end of file
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 3ac13b0a20..945318be4f 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -56,3 +56,4 @@ $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公开';
 
 $lang->testsuite->featureBar['browse']['all'] = '套件列表';
+$lang->testsuite->summary                     = "本页共 <strong>%total%</strong> 个套件，公开 <strong>%public%</strong> 个，私有 <strong>%private%</strong> 个。";
diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php
index f8e3006a1a..30112fc5e1 100644
--- a/module/testsuite/lang/zh-tw.php
+++ b/module/testsuite/lang/zh-tw.php
@@ -53,3 +53,5 @@ $lang->testsuite->lblUnlinkCase = '移除用例';
 
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公開';
+$lang->testsuite->summary               = "本頁共 <strong>%total%</strong> 個套件，公開 <strong>%public%</strong> 個，私有 <strong>%private%</strong> 個。";
+
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index 05d7aa1291..e319254273 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -82,7 +82,10 @@
     <?php endforeach;?>
     </tbody>
   </table>
-  <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+  <div class='table-footer'>
+    <div class='table-statistic'><?php echo $summary;?></div>
+    <?php $pager->show('right', 'pagerjs');?>
+  </div>
   <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 2a2e17b0e25bedcbdc5442d3da62a0156aa7ebb6 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 09:02:10 +0800
Subject: [PATCH 25/42] * remove not empty check

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

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index f0a9ae1b27..6fe312a974 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -124,7 +124,7 @@
             <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri);?></span></td>
             <td class='c-status'>
               <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
-              <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
+              <?php $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
             </td>
             <?php if($config->systemMode == 'new'):?>
             <?php $projectName = isset($projects[$task->execution]->name) ? $projects[$task->execution]->name : '';?>
@@ -201,7 +201,7 @@
               <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $child->pri;?>' title='<?php echo zget($lang->task->priList, $child->pri);?>'><?php echo zget($lang->task->priList, $child->pri);?></span></td>
               <td class='c-status'>
                 <?php $storyChanged = (!empty($child->storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
-                <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$child->status}'> " . $this->processStatus('task', $child) . "</span>");?>
+                <?php $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$child->status}'> " . $this->processStatus('task', $child) . "</span>");?>
               </td>
               <?php if($config->systemMode == 'new'):?>
               <?php $projectName = isset($projects[$child->execution]->name) ? $projects[$child->execution]->name : '';?>

From ec2638b40cbefe77100029c78115f2a2251b96db Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 10 Oct 2022 01:05:48 +0000
Subject: [PATCH 26/42] * finish task 71881

---
 module/my/view/execution.html.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 0806d65d36..97b632c463 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -34,16 +34,13 @@
       <tr class='text-left'>
         <th class='c-id'><?php echo $lang->idAB;?></th>
         <th class='c-name text-left'><?php echo $lang->my->name;?></th>
-        <?php if($config->systemMode == 'new'):?>
-        <th class='c-name text-left'><?php echo $lang->my->projects;?></th>
-        <?php endif;?>
-        <th class='c-date'><?php echo $lang->execution->begin;?></th>
-        <th class='c-date'><?php echo $lang->execution->end;?></th>
         <th class='c-status'><?php echo $lang->statusAB;?></th>
         <th class='c-user' title='<?php echo $lang->team->roleAB;?>'><?php echo $lang->team->roleAB;?></th>
+        <th class='c-user text-center'><?php echo $lang->execution->myTask;?></th>
+        <th class='c-date'><?php echo $lang->execution->begin;?></th>
+        <th class='c-date'><?php echo $lang->execution->end;?></th>
         <th class='c-date'><?php echo $lang->team->join;?></th>
         <th class='c-hours align-right'><?php echo $lang->my->hours;?></th>
-        <th class='c-user text-center'><?php echo $lang->execution->myTask;?></th>
         <th class='c-progress'><?php echo $lang->execution->progress;?></th>
       </tr>
     </thead>
@@ -62,13 +59,6 @@
           <?php endif;?>
           <?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
         </td>
-        <?php if($config->systemMode == 'new'):?>
-        <td class='c-name text-left'>
-          <?php echo isset($execution->projectName) ? html::a($this->createLink('project', 'index', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'") : '';?>
-        </td>
-        <?php endif;?>
-        <td class='c-date'><?php echo $execution->begin;?></td>
-        <td class='c-date'><?php echo $execution->end;?></td>
         <td class="c-status">
           <?php if(isset($execution->delay)):?>
           <span class="status-project status-delayed" title='<?php echo $lang->execution->delayed;?>'><?php echo $lang->execution->delayed;?></span>
@@ -78,9 +68,11 @@
           <?php endif;?>
         </td>
         <td><?php echo $execution->role;?></td>
+        <td class="text-center"><?php echo $execution->assignedToMeTasks;?></td>
+        <td class='c-date'><?php echo $execution->begin;?></td>
+        <td class='c-date'><?php echo $execution->end;?></td>
         <td class='c-date'><?php echo $execution->join;?></td>
         <td class="text-right"><?php echo $execution->hours;?></td>
-        <td class="text-center"><?php echo $execution->assignedToMeTasks;?></td>
         <td>
           <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
             <div class='progress-info'><?php echo $execution->progress;?></div>

From 383389a42accbf173f8775a0746a77cb4be59e3a Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 09:23:15 +0800
Subject: [PATCH 27/42] * add a colon

---
 module/testsuite/lang/de.php | 2 +-
 module/testsuite/lang/en.php | 2 +-
 module/testsuite/lang/fr.php | 2 +-
 module/testsuite/lang/vi.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index d55cb07b14..6c1fc44cb7 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -56,4 +56,4 @@ $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
+$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 8ef30931ca..7128ec80d4 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -56,4 +56,4 @@ $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
+$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index ec426e9128..99c4498967 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -56,4 +56,4 @@ $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites <strong>%total%</strong>, public <strong>%public%</strong>, private <strong>%private%</strong>.";
+$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
diff --git a/module/testsuite/lang/vi.php b/module/testsuite/lang/vi.php
index ca83b65da7..ec5a8292d0 100644
--- a/module/testsuite/lang/vi.php
+++ b/module/testsuite/lang/vi.php
@@ -53,4 +53,4 @@ $lang->testsuite->authorList['private'] = 'Riêng tư';
 $lang->testsuite->authorList['public']  = 'Công khai';
 
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Tổng <strong>%total%</strong> suites nào, Công khai <strong>%public%</strong>, Riêng tư <strong>%private%</strong>.";
\ No newline at end of file
+$lang->testsuite->summary                     = "Tổng <strong>%total%</strong> suites nào, Công khai: <strong>%public%</strong>, Riêng tư: <strong>%private%</strong>.";
\ No newline at end of file

From bd612c2e642c6c65e849028bb915e7018c3dd07c Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Mon, 10 Oct 2022 01:28:39 +0000
Subject: [PATCH 28/42] * Merge code.

---
 module/story/control.php          | 18 ------------------
 module/story/js/common.js         | 24 ++++++++++++++++++++++++
 module/story/js/create.js         | 24 ------------------------
 module/story/view/header.html.php | 13 -------------
 4 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index ccc9bc8d99..7a04436294 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2466,24 +2466,6 @@ class story extends control
         echo json_encode($storyInfo);
     }
 
-    /**
-     * AJAX: get the user requirements of the product.
-     *
-     * @param  int    $productID
-     * @param  string $labelName
-     * @param  bool   $isMultiple
-     * @param  int    $defaultID
-     * @access public
-     * @return string
-     */
-    public function ajaxGetProductURS($productID, $labelName = '', $isMultiple = false, $defaultID = '')
-    {
-        $requirements = array('0' => '') + $this->story->getRequirements($productID);
-        $labelName    = $isMultiple ? $labelName . '[]' : $labelName;
-        $misc         = $isMultiple ? 'class="form-control" multiple' : 'class="form-control"';
-        return print(html::select($labelName, $requirements, $defaultID, $misc));
-    }
-
     /**
      * AJAX: get the parent story.
      *
diff --git a/module/story/js/common.js b/module/story/js/common.js
index ce4a67d484..5e6525c4eb 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -62,3 +62,27 @@ function getStatus(method, params)
         $('form #status').val(status).change();
     });
 }
+
+/**
+ * Load URS.
+ *
+ * @access public
+ * @return void
+ */
+function loadURS()
+{
+    var productID       = $('#product').val();
+    var branchID        = $('#branch').val();
+    var moduleID        = $('#module').val();
+    var requirementList = $('#URS').val();
+    requirementList     = requirementList ? requirementList.join(',') : '';
+
+    var link = createLink('story', 'ajaxGetURS', 'productID=' + productID + '&branchID=' + branchID + '&moduleID=' + moduleID + '&requirementList=' + requirementList);
+
+    $.post(link, function(data)
+    {
+        $('#URS').replaceWith(data);
+        $('#URS_chosen').remove();
+        $('#URS').chosen();
+    });
+}
diff --git a/module/story/js/create.js b/module/story/js/create.js
index f976714126..868dfd6a20 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -80,30 +80,6 @@ function loadAssignedTo()
     });
 }
 
-/**
- * Load URS.
- *
- * @access public
- * @return void
- */
-function loadURS()
-{
-    var productID       = $('#product').val();
-    var branchID        = $('#branch').val();
-    var moduleID        = $('#module').val();
-    var requirementList = $('#URS').val();
-    requirementList     = requirementList ? requirementList.join(',') : '';
-
-    var link = createLink('story', 'ajaxGetURS', 'productID=' + productID + '&branchID=' + branchID + '&moduleID=' + moduleID + '&requirementList=' + requirementList);
-
-    $.post(link, function(data)
-    {
-        $('#URS').replaceWith(data);
-        $('#URS_chosen').remove();
-        $('#URS').chosen();
-    });
-}
-
 function refreshPlan()
 {
     loadProductPlans($('#product').val(), $('#branch').val());
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index 0640d71d1b..5d84b1a6b8 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -40,15 +40,6 @@ function loadProduct(productID)
 
     if(typeof(storyType) == 'string' && storyType == 'story')
     {
-        var requirementLink = createLink('story', 'ajaxGetProductURS', 'productID=' + productID + '&labelName=URS' + '&isMultiple=1');
-        $.get(requirementLink, function(data)
-        {
-            $('#URS').replaceWith(data);
-            $('#URS' + "_chosen").remove();
-            $('#URS').next('.picker').remove();
-            $('#URS').chosen();
-        });
-
         var storyLink = createLink('story', 'ajaxGetParentStory', 'productID=' + productID + '&labelName=parent');
         $.get(storyLink, function(data)
         {
@@ -75,7 +66,6 @@ function loadBranch()
 
     loadProductModules(productID, branch);
     loadProductPlans(productID, branch);
-    loadURS();
 }
 
 /**
@@ -105,7 +95,6 @@ function loadProductBranches(productID)
 
         loadProductModules(productID, $('#branch').val());
         loadProductPlans(productID, $('#branch').val());
-        loadURS();
     })
 }
 
@@ -136,8 +125,6 @@ function loadProductModules(productID, branch)
         if(typeof(storyModule) == 'string' && config.currentMethod != 'edit') $moduleIDBox.prepend("<span class='input-group-addon'>" + storyModule + "</span>");
         $moduleIDBox.fixInputGroup();
     });
-
-    loadURS();
 }
 
 /**

From 209e38775da5548e476cac5289287f0ab428c653 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 09:32:56 +0800
Subject: [PATCH 29/42] * rm class

---
 module/project/css/execution.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/project/css/execution.css b/module/project/css/execution.css
index 030c955446..014a197078 100644
--- a/module/project/css/execution.css
+++ b/module/project/css/execution.css
@@ -12,4 +12,3 @@ th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
 #executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;}
 #executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
 .table-statistic {padding-left: 10px;}
-#executionTableList .table-nest-icon {top: 6px;}

From f95cedc085a19e82ddb3e9a1516758a46a8dc5e4 Mon Sep 17 00:00:00 2001
From: denghongtao <denghongtao@easycorp.ltd>
Date: Mon, 10 Oct 2022 01:45:57 +0000
Subject: [PATCH 30/42] * Add repo create unittest.

---
 test/class/repo.class.php  | 15 ++++++++++++++-
 test/model/repo/create.php | 39 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/test/class/repo.class.php b/test/class/repo.class.php
index 7ed1021ee4..c8acfe550e 100644
--- a/test/class/repo.class.php
+++ b/test/class/repo.class.php
@@ -32,6 +32,13 @@ class repoTest
         return $objects;
     }
 
+    /**
+     * Get switcher test.
+     *
+     * @param  int    $repoID
+     * @access public
+     * @return object
+     */
     public function getSwitcherTest($repoID)
     {
         $objects = $this->objectModel->getSwitcher($repoID);
@@ -59,8 +66,14 @@ class repoTest
         return $objects;
     }
 
-    public function createTest()
+    public function createTest($list)
     {
+        $create    = array();
+        $getCreate = array('SCM' => '', 'serviceHost' => '', 'serviceProject' => '', 'name' => '', 'path' => '', 'encoding' => '', 'client' => '', 'account' => '', 'password' => '', 'encrypt' => '', 'desc' => '', 'uid' => '');
+
+        foreach($getCreate as $filed => $defaultvalue) $_POST[$filed] = $defaultvalue;
+        foreach($list as $key => $value) $_POST[$key] = $value;
+
         $objects = $this->objectModel->create();
 
         if(dao::isError()) return dao::getError();
diff --git a/test/model/repo/create.php b/test/model/repo/create.php
index 15feb6410d..a808c1aadc 100644
--- a/test/model/repo/create.php
+++ b/test/model/repo/create.php
@@ -14,4 +14,41 @@ pid=1
 
 $repo = new repoTest();
 
-r($repo->createTest()) && p() && e();
\ No newline at end of file
+$list = array(
+    'product'        => '1',
+    'SCM'            => 'Gitlab',
+    'serviceHost'    => '2',
+    'serviceProject' => '971',
+    'name'           => 'zzxx',
+    'path'           => '',
+    'encoding'       => 'utf-8',
+    'client'         => '/usr/bin/git',
+    'account'        => '',
+    'password'       => '',
+    'encrypt'        => 'base64',
+    'desc'           => '',
+    'uid'            => '6321819c78be5'
+);
+
+$listOne = array(
+    'SCM'            => 'Gitea',
+    'serviceHost'    => 2,
+    'serviceProject' => 'root/Demo',
+    'name'           => 'Demo',
+    'path'           => '',
+    'encoding'       => 'utf-8',
+    'client'         => '/usr/bin/git',
+    'account'        => '',
+    'password'       => '',
+    'encrypt'        => 'base64',
+    'desc'           => '',
+    'uid'            => '6322b184f3a72'
+);
+
+$resultOne   = $repo->createTest($list);
+$resultTwo   = $repo->createTest($list);
+$resultThree = $repo->createTest($listOne);
+
+r($resultOne)   && p($resultOne)   && e('1');
+r($resultTwo)   && p('name:0')     && e('『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。');
+r($resultThree) && p($resultThree) && e('因为安全原因，需要检测客户端版本，请将版本号写入文件');

From 83a6a8ab53b048f2730d25bf714b1075802ad472 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 09:58:19 +0800
Subject: [PATCH 31/42] * finish task #71885 && #71893

---
 module/my/view/testtask.html.php     |  8 ++++----
 module/testtask/view/browse.html.php | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 9df1becf44..41ea4b2004 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -35,11 +35,11 @@
       <tr>
         <th class='c-id'>       <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
         <th>                    <?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
-        <th class='c-execution'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
         <th class='c-build'>    <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
+        <th class='c-execution'><?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
+        <th class='c-status'>   <?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
         <th class='c-date'>     <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='c-date'>     <?php common::printOrderLink('end',       $orderBy, $vars, $lang->testtask->end);?></th>
-        <th class='c-status'>   <?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
         <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
@@ -48,11 +48,11 @@
       <tr>
         <td class="c-id"><?php printf('%03d', $task->id);?></td>
         <td class='text-left nobr' title='<?php echo $task->name;?>'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
-        <td class='nobr' title='<?php echo $task->executionName;?>'><?php echo $task->executionName;?></td>
         <td class='nobr' title='<?php echo $task->build == 'trunk' ? $lang->trunk : $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
+        <td class='nobr' title='<?php echo $task->executionName;?>'><?php echo $task->executionName;?></td>
+        <td title='<?php echo $this->processStatus('testtask', $task);?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
         <td><?php echo $task->begin?></td>
         <td><?php echo $task->end?></td>
-        <td title='<?php echo $this->processStatus('testtask', $task);?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
         <td class='c-actions'>
           <?php
           common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'");
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 3006fdf351..f6c1afa48b 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -60,13 +60,13 @@ $status = $this->session->testTaskVersionStatus;
       <tr>
         <th class='c-id text-left'>    <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
         <th class='c-name text-left'>  <?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
+        <th class='text-left'>         <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
         <th class='text-left'>         <?php common::printOrderLink('product',   $orderBy, $vars, $lang->testtask->product);?></th>
         <th class='text-left'>         <?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
-        <th class='text-left'>         <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
+        <th class='c-status text-left'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
         <th class='c-user text-left'>  <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
         <th class='c-date text-left'>  <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='c-date text-left'>  <?php common::printOrderLink('end',       $orderBy, $vars, $lang->testtask->end);?></th>
-        <th class='c-status text-left'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
         <?php
         $extendFields = $this->testtask->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
@@ -79,18 +79,19 @@ $status = $this->session->testTaskVersionStatus;
     <tr class='text-left'>
       <td><?php echo html::a(inlink('cases', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
       <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
+      <td class='c-name' title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "data-group=execution");?></td>
       <td class='c-name' title="<?php echo $task->productName?>"><?php echo $task->productName?></td>
       <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
-      <td class='c-name' title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "data-group=execution");?></td>
-      <td title="<?php echo zget($users, $task->owner);?>"><?php echo zget($users, $task->owner);?></td>
-      <td><?php echo $task->begin?></td>
-      <td><?php echo $task->end?></td>
       <?php $status = $this->processStatus('testtask', $task);?>
       <td title='<?php echo $status;?>'>
         <span class='status-task status-<?php echo $task->status?>'>
           <?php echo $status;?>
         </span>
       </td>
+      <td title="<?php echo zget($users, $task->owner);?>"><?php echo zget($users, $task->owner);?></td>
+      <td><?php echo $task->begin?></td>
+      <td><?php echo $task->end?></td>
+      
       <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $task) . "</td>";?>
       <td class='c-actions'>
         <?php echo $this->testtask->buildOperateMenu($task, 'browse');?>

From f4aa9517743a37f602387a9bda9a7c6706c9e257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Mon, 10 Oct 2022 09:59:14 +0800
Subject: [PATCH 32/42] * Finish task #71874.

---
 module/bug/config.php | 144 +++++++++++++++++++++---------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 5ac6e7d586..a2dc0c6292 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -24,7 +24,7 @@ $config->bug->list->allFields = 'id, module, execution, story, task,
     lastEditedBy,
     lastEditedDate';
 
-$config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution';
+$config->bug->list->defaultFields = 'id,title,severity,pri,openedBy,assignedTo,resolvedBy,resolution';
 
 $config->bug->exportFields = 'id, product, branch, module, project, execution, story, task,
     title, keywords, severity, pri, type, os, browser,
@@ -159,7 +159,7 @@ $config->bug->search['params']['deadline']      = array('operator' => '=',
 $config->bug->search['params']['activatedDate'] = array('operator' => '=',       'control' => 'input',  'values' => '', 'class' => 'date');
 
 $config->bug->datatable = new stdclass();
-$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'confirmed', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions');
+$config->bug->datatable->defaultField = array('id', 'title', 'severity', 'pri', 'status', 'openedBy', 'openedDate', 'confirmed', 'assignedTo', 'resolution', 'actions');
 
 $config->bug->datatable->fieldList['id']['title']    = 'idAB';
 $config->bug->datatable->fieldList['id']['fixed']    = 'left';
@@ -174,6 +174,12 @@ $config->bug->datatable->fieldList['module']['control']    = 'select';
 $config->bug->datatable->fieldList['module']['title']      = 'module';
 $config->bug->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug');
 
+$config->bug->datatable->fieldList['title']['title']    = 'title';
+$config->bug->datatable->fieldList['title']['fixed']    = 'left';
+$config->bug->datatable->fieldList['title']['width']    = 'auto';
+$config->bug->datatable->fieldList['title']['required'] = 'yes';
+$config->bug->datatable->fieldList['title']['minWidth'] = '200';
+
 $config->bug->datatable->fieldList['severity']['title']    = 'severityAB';
 $config->bug->datatable->fieldList['severity']['fixed']    = 'left';
 $config->bug->datatable->fieldList['severity']['width']    = '50';
@@ -186,16 +192,10 @@ $config->bug->datatable->fieldList['pri']['width']    = '50';
 $config->bug->datatable->fieldList['pri']['required'] = 'no';
 $config->bug->datatable->fieldList['pri']['name']     = $lang->bug->pri;
 
-$config->bug->datatable->fieldList['confirmed']['title']    = 'confirmedAB';
-$config->bug->datatable->fieldList['confirmed']['fixed']    = 'left';
-$config->bug->datatable->fieldList['confirmed']['width']    = '100';
-$config->bug->datatable->fieldList['confirmed']['required'] = 'no';
-
-$config->bug->datatable->fieldList['title']['title']    = 'title';
-$config->bug->datatable->fieldList['title']['fixed']    = 'left';
-$config->bug->datatable->fieldList['title']['width']    = 'auto';
-$config->bug->datatable->fieldList['title']['required'] = 'yes';
-$config->bug->datatable->fieldList['title']['minWidth'] = '200';
+$config->bug->datatable->fieldList['status']['title']    = 'statusAB';
+$config->bug->datatable->fieldList['status']['fixed']    = 'left';
+$config->bug->datatable->fieldList['status']['width']    = '80';
+$config->bug->datatable->fieldList['status']['required'] = 'no';
 
 $config->bug->datatable->fieldList['branch']['title']      = 'branch';
 $config->bug->datatable->fieldList['branch']['fixed']      = 'left';
@@ -230,10 +230,66 @@ $config->bug->datatable->fieldList['plan']['fixed']    = 'no';
 $config->bug->datatable->fieldList['plan']['width']    = '120';
 $config->bug->datatable->fieldList['plan']['required'] = 'no';
 
-$config->bug->datatable->fieldList['status']['title']    = 'statusAB';
-$config->bug->datatable->fieldList['status']['fixed']    = 'no';
-$config->bug->datatable->fieldList['status']['width']    = '80';
-$config->bug->datatable->fieldList['status']['required'] = 'no';
+$config->bug->datatable->fieldList['openedBy']['title']    = 'openedByAB';
+$config->bug->datatable->fieldList['openedBy']['fixed']    = 'no';
+$config->bug->datatable->fieldList['openedBy']['width']    = '80';
+$config->bug->datatable->fieldList['openedBy']['required'] = 'no';
+
+$config->bug->datatable->fieldList['openedDate']['title']    = 'openedDateAB';
+$config->bug->datatable->fieldList['openedDate']['fixed']    = 'no';
+$config->bug->datatable->fieldList['openedDate']['width']    = '90';
+$config->bug->datatable->fieldList['openedDate']['required'] = 'no';
+
+$config->bug->datatable->fieldList['openedBuild']['title']      = 'openedBuild';
+$config->bug->datatable->fieldList['openedBuild']['fixed']      = 'no';
+$config->bug->datatable->fieldList['openedBuild']['width']      = '120';
+$config->bug->datatable->fieldList['openedBuild']['required']   = 'no';
+$config->bug->datatable->fieldList['openedBuild']['control']    = 'multiple';
+$config->bug->datatable->fieldList['openedBuild']['dataSource'] = array('module' => 'build', 'method' =>'getBuildPairs', 'params' => '$productID&$branch&noempty,noterminate,nodone,withbranch');
+
+$config->bug->datatable->fieldList['confirmed']['title']    = 'confirmedAB';
+$config->bug->datatable->fieldList['confirmed']['fixed']    = 'no';
+$config->bug->datatable->fieldList['confirmed']['width']    = '100';
+$config->bug->datatable->fieldList['confirmed']['required'] = 'no';
+
+$config->bug->datatable->fieldList['assignedTo']['title']      = 'assignedToAB';
+$config->bug->datatable->fieldList['assignedTo']['fixed']      = 'no';
+$config->bug->datatable->fieldList['assignedTo']['width']      = '120';
+$config->bug->datatable->fieldList['assignedTo']['required']   = 'no';
+$config->bug->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' =>'getPairs', 'params' => 'noclosed|noletter');
+
+$config->bug->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
+$config->bug->datatable->fieldList['assignedDate']['fixed']    = 'no';
+$config->bug->datatable->fieldList['assignedDate']['width']    = '90';
+$config->bug->datatable->fieldList['assignedDate']['required'] = 'no';
+
+$config->bug->datatable->fieldList['deadline']['title']    = 'deadline';
+$config->bug->datatable->fieldList['deadline']['fixed']    = 'no';
+$config->bug->datatable->fieldList['deadline']['width']    = '90';
+$config->bug->datatable->fieldList['deadline']['required'] = 'no';
+$config->bug->datatable->fieldList['deadline']['control']  = 'date';
+
+$config->bug->datatable->fieldList['resolvedBy']['title']    = 'resolvedBy';
+$config->bug->datatable->fieldList['resolvedBy']['fixed']    = 'no';
+$config->bug->datatable->fieldList['resolvedBy']['width']    = '100';
+$config->bug->datatable->fieldList['resolvedBy']['required'] = 'no';
+
+$config->bug->datatable->fieldList['resolution']['title']    = 'resolutionAB';
+$config->bug->datatable->fieldList['resolution']['fixed']    = 'no';
+$config->bug->datatable->fieldList['resolution']['width']    = '110';
+$config->bug->datatable->fieldList['resolution']['required'] = 'no';
+
+$config->bug->datatable->fieldList['resolvedDate']['title']    = 'resolvedDateAB';
+$config->bug->datatable->fieldList['resolvedDate']['fixed']    = 'no';
+$config->bug->datatable->fieldList['resolvedDate']['width']    = '120';
+$config->bug->datatable->fieldList['resolvedDate']['required'] = 'no';
+
+$config->bug->datatable->fieldList['resolvedBuild']['title']    = 'resolvedBuild';
+$config->bug->datatable->fieldList['resolvedBuild']['fixed']    = 'no';
+$config->bug->datatable->fieldList['resolvedBuild']['width']    = '120';
+$config->bug->datatable->fieldList['resolvedBuild']['required'] = 'no';
+$config->bug->datatable->fieldList['resolvedBuild']['control']  = 'select';
+$config->bug->datatable->fieldList['resolvedBuild']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'resolvedBuild&id,name');
 
 $config->bug->datatable->fieldList['activatedCount']['title']    = 'activatedCountAB';
 $config->bug->datatable->fieldList['activatedCount']['fixed']    = 'no';
@@ -283,62 +339,6 @@ $config->bug->datatable->fieldList['mailto']['fixed']    = 'no';
 $config->bug->datatable->fieldList['mailto']['width']    = '100';
 $config->bug->datatable->fieldList['mailto']['required'] = 'no';
 
-$config->bug->datatable->fieldList['openedBy']['title']    = 'openedByAB';
-$config->bug->datatable->fieldList['openedBy']['fixed']    = 'no';
-$config->bug->datatable->fieldList['openedBy']['width']    = '80';
-$config->bug->datatable->fieldList['openedBy']['required'] = 'no';
-
-$config->bug->datatable->fieldList['openedDate']['title']    = 'openedDateAB';
-$config->bug->datatable->fieldList['openedDate']['fixed']    = 'no';
-$config->bug->datatable->fieldList['openedDate']['width']    = '90';
-$config->bug->datatable->fieldList['openedDate']['required'] = 'no';
-
-$config->bug->datatable->fieldList['openedBuild']['title']      = 'openedBuild';
-$config->bug->datatable->fieldList['openedBuild']['fixed']      = 'no';
-$config->bug->datatable->fieldList['openedBuild']['width']      = '120';
-$config->bug->datatable->fieldList['openedBuild']['required']   = 'no';
-$config->bug->datatable->fieldList['openedBuild']['control']    = 'multiple';
-$config->bug->datatable->fieldList['openedBuild']['dataSource'] = array('module' => 'build', 'method' =>'getBuildPairs', 'params' => '$productID&$branch&noempty,noterminate,nodone,withbranch');
-
-$config->bug->datatable->fieldList['assignedTo']['title']      = 'assignedToAB';
-$config->bug->datatable->fieldList['assignedTo']['fixed']      = 'no';
-$config->bug->datatable->fieldList['assignedTo']['width']      = '120';
-$config->bug->datatable->fieldList['assignedTo']['required']   = 'no';
-$config->bug->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' =>'getPairs', 'params' => 'noclosed|noletter');
-
-$config->bug->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
-$config->bug->datatable->fieldList['assignedDate']['fixed']    = 'no';
-$config->bug->datatable->fieldList['assignedDate']['width']    = '90';
-$config->bug->datatable->fieldList['assignedDate']['required'] = 'no';
-
-$config->bug->datatable->fieldList['deadline']['title']    = 'deadline';
-$config->bug->datatable->fieldList['deadline']['fixed']    = 'no';
-$config->bug->datatable->fieldList['deadline']['width']    = '90';
-$config->bug->datatable->fieldList['deadline']['required'] = 'no';
-$config->bug->datatable->fieldList['deadline']['control']  = 'date';
-
-$config->bug->datatable->fieldList['resolvedBy']['title']    = 'resolvedByAB';
-$config->bug->datatable->fieldList['resolvedBy']['fixed']    = 'no';
-$config->bug->datatable->fieldList['resolvedBy']['width']    = '100';
-$config->bug->datatable->fieldList['resolvedBy']['required'] = 'no';
-
-$config->bug->datatable->fieldList['resolution']['title']    = 'resolutionAB';
-$config->bug->datatable->fieldList['resolution']['fixed']    = 'no';
-$config->bug->datatable->fieldList['resolution']['width']    = '110';
-$config->bug->datatable->fieldList['resolution']['required'] = 'no';
-
-$config->bug->datatable->fieldList['resolvedDate']['title']    = 'resolvedDateAB';
-$config->bug->datatable->fieldList['resolvedDate']['fixed']    = 'no';
-$config->bug->datatable->fieldList['resolvedDate']['width']    = '120';
-$config->bug->datatable->fieldList['resolvedDate']['required'] = 'no';
-
-$config->bug->datatable->fieldList['resolvedBuild']['title']    = 'resolvedBuild';
-$config->bug->datatable->fieldList['resolvedBuild']['fixed']    = 'no';
-$config->bug->datatable->fieldList['resolvedBuild']['width']    = '120';
-$config->bug->datatable->fieldList['resolvedBuild']['required'] = 'no';
-$config->bug->datatable->fieldList['resolvedBuild']['control']  = 'select';
-$config->bug->datatable->fieldList['resolvedBuild']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'resolvedBuild&id,name');
-
 $config->bug->datatable->fieldList['closedBy']['title']    = 'closedBy';
 $config->bug->datatable->fieldList['closedBy']['fixed']    = 'no';
 $config->bug->datatable->fieldList['closedBy']['width']    = '80';

From 01fac13aeed7d7c24f581c51cb079547a5d56dea Mon Sep 17 00:00:00 2001
From: denghongtao <denghongtao@easycorp.ltd>
Date: Mon, 10 Oct 2022 02:04:59 +0000
Subject: [PATCH 33/42] * Fix unittest note.

---
 test/model/repo/checkpriv.php | 4 +++-
 test/model/repo/create.php    | 6 +++++-
 test/ztest                    | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 test/model/repo/checkpriv.php
 mode change 100644 => 100755 test/model/repo/create.php

diff --git a/test/model/repo/checkpriv.php b/test/model/repo/checkpriv.php
old mode 100644
new mode 100755
index c7308b0637..a7a980c74b
--- a/test/model/repo/checkpriv.php
+++ b/test/model/repo/checkpriv.php
@@ -10,6 +10,8 @@ title=测试 repoModel->checkPriv();
 cid=1
 pid=1
 
+ >> 0
+
 */
 
 $checkPriv = new repoTest();
@@ -20,4 +22,4 @@ $repo->acl->user   = 'admin';
 
 $result = $checkPriv->checkPrivTest($repo);
 
-r($result) && p($result) && e('0');
+r($result) && p($result) && e('0');
\ No newline at end of file
diff --git a/test/model/repo/create.php b/test/model/repo/create.php
old mode 100644
new mode 100755
index a808c1aadc..bc42977edc
--- a/test/model/repo/create.php
+++ b/test/model/repo/create.php
@@ -10,6 +10,10 @@ title=测试 repoModel->create();
 cid=1
 pid=1
 
+ >> 1
+ >> 『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
+ >> 因为安全原因，需要检测客户端版本，请将版本号写入文件
+
 */
 
 $repo = new repoTest();
@@ -51,4 +55,4 @@ $resultThree = $repo->createTest($listOne);
 
 r($resultOne)   && p($resultOne)   && e('1');
 r($resultTwo)   && p('name:0')     && e('『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。');
-r($resultThree) && p($resultThree) && e('因为安全原因，需要检测客户端版本，请将版本号写入文件');
+r($resultThree) && p($resultThree) && e('因为安全原因，需要检测客户端版本，请将版本号写入文件');
\ No newline at end of file
diff --git a/test/ztest b/test/ztest
index 2febe0d248..be776ffd95 100755
--- a/test/ztest
+++ b/test/ztest
@@ -202,6 +202,9 @@ switch($argv[1])
     case 'webhook':
         ztfRun('model/webhook');
         break;
+    case 'repo':
+        ztfRun('model/repo');
+        break;
 
     default:
         ztfExtract($argv[1]);

From d6bd6c978b60a967cefb54c456d07a58a84b07d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Mon, 10 Oct 2022 10:05:40 +0800
Subject: [PATCH 34/42] * Modify bug list style.

---
 module/user/view/bug.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 3a92c71feb..d13f6c87f0 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -39,10 +39,10 @@
       <thead>
         <tr class='text-center'>
           <th class='c-id'>        <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+          <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
-          <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
@@ -52,10 +52,10 @@
         <?php foreach($bugs as $bug):?>
         <tr class='text-center'>
           <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
           <td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
           <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
-          <td><?php echo $lang->bug->typeList[$bug->type]?></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+          <td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
           <td><?php echo zget($users, $bug->openedBy);?></td>
           <td><?php echo zget($users, $bug->resolvedBy);?></td>
           <td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>

From 46e14081095dc46b6cc08fcf659439f94fdd9a1e Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 10:08:38 +0800
Subject: [PATCH 35/42] * modify privateNum

---
 module/testsuite/control.php    | 7 ++-----
 module/testsuite/lang/de.php    | 4 ++--
 module/testsuite/lang/en.php    | 4 ++--
 module/testsuite/lang/fr.php    | 4 ++--
 module/testsuite/lang/vi.php    | 4 ++--
 module/testsuite/lang/zh-cn.php | 4 ++--
 module/testsuite/lang/zh-tw.php | 3 +--
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 7877cd34bf..9908481772 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -81,18 +81,15 @@ class testsuite extends control
             $pager  = pager::init(0, $recPerPage, 1);
             $suites = $this->testsuite->getSuites($productID, $sort, $pager, $type);
         }
-        $privateSuites = array();
+        $privateNum = 0;
         foreach($suites as $suiteItem)
         {
-            $item = new stdclass();
-            $item = $suiteItem;
             if($suiteItem->type == 'private')
             {
-                $privateSuites[] = $item;
+                $privateNum++;
             }
         }
         $suitesNum         = !empty(count($suites, 0)) ? count($suites, 0) : 0;
-        $privateNum        = !empty(count($privateSuites, 0)) ? count($privateSuites, 0) : 0;
         $publicNum         = $suitesNum - $privateNum;
         $summary           = str_replace(array('%total%', '%public%', '%private%'), array($suitesNum, $publicNum, $privateNum), $this->lang->testsuite->summary);
 
diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index 6c1fc44cb7..d5e3e7fe86 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -48,6 +48,7 @@ $lang->testsuite->confirmUnlinkCase = 'Möchten Sie diese Verknüpfung aufheben?
 $lang->testsuite->noticeNone        = 'Sie haben noch keine Suite erstellt.';
 $lang->testsuite->noModule          = '<div>Sie haben keine Module</div><div>Jetzt verwalten</div>';
 $lang->testsuite->noTestsuite       = 'Keine Suite. ';
+$lang->testsuite->summary           = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
 
 $lang->testsuite->lblCases      = 'Fälle';
 $lang->testsuite->lblUnlinkCase = 'Unverknüpfte Fälle';
@@ -55,5 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Unverknüpfte Fälle';
 $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 7128ec80d4..cb4281af01 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -48,6 +48,7 @@ $lang->testsuite->confirmUnlinkCase = 'Do you want to unlink this Case?';
 $lang->testsuite->noticeNone        = 'You have not created any suite yet.';
 $lang->testsuite->noModule          = '<div>You have no modules.</div><div>Manage it now.</div>';
 $lang->testsuite->noTestsuite       = 'No suites yet.';
+$lang->testsuite->summary           = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
 
 $lang->testsuite->lblCases      = 'Cases';
 $lang->testsuite->lblUnlinkCase = 'Unlink Case';
@@ -55,5 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Unlink Case';
 $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index 99c4498967..919364f957 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -48,6 +48,7 @@ $lang->testsuite->confirmUnlinkCase = 'Voulez-vous retirer ce CasTest ?';
 $lang->testsuite->noticeNone        = "Vous n'avez pas encore créé de Cahier de Recette pour l'instant.";
 $lang->testsuite->noModule          = '<div>Vous avez aucun Module.</div><div>Gérer les Modules maintenant.</div>';
 $lang->testsuite->noTestsuite       = 'Aucun Cahier de Recette.';
+$lang->testsuite->summary           = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
 
 $lang->testsuite->lblCases      = 'CasTests';
 $lang->testsuite->lblUnlinkCase = 'Retirer CasTest';
@@ -55,5 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Retirer CasTest';
 $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Total suites: <strong>%total%</strong>, public: <strong>%public%</strong>, private: <strong>%private%</strong>.";
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
diff --git a/module/testsuite/lang/vi.php b/module/testsuite/lang/vi.php
index ec5a8292d0..457ea04a1d 100644
--- a/module/testsuite/lang/vi.php
+++ b/module/testsuite/lang/vi.php
@@ -45,6 +45,7 @@ $lang->testsuite->confirmUnlinkCase = 'Bạn có muốn hủy liên kết tình
 $lang->testsuite->noticeNone        = 'Bạn chưa tạo suite nào';
 $lang->testsuite->noModule          = '<div>Chưa có Module.</div><div>Quản lý ngay.</div>';
 $lang->testsuite->noTestsuite       = 'Không có suites nào';
+$lang->testsuite->summary           = "Tổng <strong>%total%</strong> suites nào, Công khai: <strong>%public%</strong>, Riêng tư: <strong>%private%</strong>.";
 
 $lang->testsuite->lblCases      = 'Tình huống';
 $lang->testsuite->lblUnlinkCase = 'Hủy liên kết tình huống';
@@ -52,5 +53,4 @@ $lang->testsuite->lblUnlinkCase = 'Hủy liên kết tình huống';
 $lang->testsuite->authorList['private'] = 'Riêng tư';
 $lang->testsuite->authorList['public']  = 'Công khai';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
-$lang->testsuite->summary                     = "Tổng <strong>%total%</strong> suites nào, Công khai: <strong>%public%</strong>, Riêng tư: <strong>%private%</strong>.";
\ No newline at end of file
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 945318be4f..245fded3ca 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -48,6 +48,7 @@ $lang->testsuite->confirmUnlinkCase = '您确认要移除该用例吗？';
 $lang->testsuite->noticeNone        = '您还没有创建套件';
 $lang->testsuite->noModule          = '<div>您现在还没有模块信息</div><div>请维护用例库模块</div>';
 $lang->testsuite->noTestsuite       = '暂时没有套件。';
+$lang->testsuite->summary           = "本页共 <strong>%total%</strong> 个套件，公开 <strong>%public%</strong> 个，私有 <strong>%private%</strong> 个。";
 
 $lang->testsuite->lblCases      = '用例列表';
 $lang->testsuite->lblUnlinkCase = '移除用例';
@@ -55,5 +56,4 @@ $lang->testsuite->lblUnlinkCase = '移除用例';
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公开';
 
-$lang->testsuite->featureBar['browse']['all'] = '套件列表';
-$lang->testsuite->summary                     = "本页共 <strong>%total%</strong> 个套件，公开 <strong>%public%</strong> 个，私有 <strong>%private%</strong> 个。";
+$lang->testsuite->featureBar['browse']['all'] = '套件列表';
\ No newline at end of file
diff --git a/module/testsuite/lang/zh-tw.php b/module/testsuite/lang/zh-tw.php
index 30112fc5e1..bbf98e3817 100644
--- a/module/testsuite/lang/zh-tw.php
+++ b/module/testsuite/lang/zh-tw.php
@@ -47,11 +47,10 @@ $lang->testsuite->confirmUnlinkCase = '您確認要移除該用例嗎？';
 $lang->testsuite->noticeNone        = '您還沒有創建套件';
 $lang->testsuite->noModule          = '<div>您現在還沒有模組信息</div><div>請維護用例庫模組</div>';
 $lang->testsuite->noTestsuite       = '暫時沒有套件。';
+$lang->testsuite->summary           = "本頁共 <strong>%total%</strong> 個套件，公開 <strong>%public%</strong> 個，私有 <strong>%private%</strong> 個。";
 
 $lang->testsuite->lblCases      = '用例列表';
 $lang->testsuite->lblUnlinkCase = '移除用例';
 
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公開';
-$lang->testsuite->summary               = "本頁共 <strong>%total%</strong> 個套件，公開 <strong>%public%</strong> 個，私有 <strong>%private%</strong> 個。";
-

From 3f980942cb7888d0418345b31f2abc23d411fcee Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 10:27:13 +0800
Subject: [PATCH 36/42] * modify lines

---
 module/task/css/.create.css.swp | Bin 0 -> 12288 bytes
 module/testsuite/control.php    |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 module/task/css/.create.css.swp

diff --git a/module/task/css/.create.css.swp b/module/task/css/.create.css.swp
new file mode 100644
index 0000000000000000000000000000000000000000..47a60a3709e54cbf4026101c42295141563734bf
GIT binary patch
literal 12288
zcmeI2&u<$=6vwBz@Uwv6*vo5OL@C*|9Ve-=Arh@BQKX&-h3j}{Y)`Yhv+Rs(CswHh
zSN;f)xbz?3!e79dzo6pG3H|`Sv%B6nvD1WO(8T^`*WUN$z4^?Ww~DfZ)}sdxsT;N#
ze%@j1>+kPH&u`siU;MJcraT=T$wVr5?Il08U680$Wzkut%_lr>PN&o6Y&Hm|M@gu4
z7DiF?NT!zSEHTYQi%Be-mYaiSWK1*4CATuf=~-j??>zxe-~t3Db{KT8vd&h!<*XYw
zuG4$(esuvyZ{i7f0-k^;;0bsFo`5Id33vkk7XmiB!k%F=8`Xq9sE$`o9jlN2;0bsF
zo`5Id33vjYfG6Mycmke)C*TQq0+)~g7mR)P3S+ykB6<A(fARPK&u=sK6J($p(2KVi
z8$uGg3H@`GvA?0;p=Zzr^v9cwJ%VmQ8_@GN82bTw0DTU92)%fnv0tG>Xa;=)eF}X7
zU4#C74Svu==o<7F^7;+>5mHc*=OyIqQ}zTr0Z+ga@B}V7frjOHn}dDHllwwhos-2|
zP#BH1k!fI5I*KLD$5M^Pw%6IsW>49Qi>M9AS@hSK<TTH?5E!mU-E2m8pz7$%@w6b1
zT^1A;r@=sr!zGvY7VJCj*H)_xu;LNv)Z*#GC8rj(Xs57l-llUx1XgD~a$)*U>2`BX
zMq|l^%oq7tWgV9xf&$W!gl`AF6zN#!J!*8K?aof8Pq9j6P|>5U?K5((#$I5iZD&X|
zur}sQt+kwl;;|kr^LKn`s)QZ)Xt$yj9!Qx5xt><3EZG+`W-N??@`=ru=9P2Xg+)+z
zX%btN#d06DvT_{;WwGSaz|PPfW*v^X2~s%?tTZ+pqk3XjK@z31Kr|c<i_y<;KJB=9
zejKd5Hp(iU_9&Mzx9W*pT9R(}e&^nKAvf_roeTXXHpAgvJtIt?8>2?46#M#k@~wh%
zy+o*Iw?3ym1)h05_Sr6hu2^Nc+N70lk%UU%zvdE;+$2ps@|`mVPI<BvezA2<Bx(5o
zg*=#8tJ82`Q<@KSjzaIzx-m=Zsz<0ao7iBK>q$o8(uV*WUDpEzu^d`#50tRcu@ck}
zk$d&23>4%=YguD(n&)!xBHVw-wJOm_CmG-^D%SN3jvbmW8r|YT+4uJ9kCNxnnC3;3
zX!WT|8E56>ioLl8>&a$XM?+1WY_AtZe%wRL#bF^zConRWk?Y-i6pCDDLQm5mk?CZq
z7cTblY5QWu>ncXKEV}Y_m1H`%JhgQzX}4PMqrzDOBhW|n436i7;A>~)I%`n_LC%Gm
z7!(#Qk6%^6K%)Yaml&cNBAp!;`!Xn&zsH9b9eFO4$zp!kqd}~rgL-w!{zb)_mA8Sg
z=-Oq)hPnK9qH;7OB)&L5XT+_KU2i>az?DH#oyr28%l~e%)9Rhubqh%Y9v!%Sl!~D4
oj_n~{ebT5`Wih!nZcMn3eI_1HjHRKwRl9E7*lzE@47aR*0k8%1q5uE@

literal 0
HcmV?d00001

diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 9908481772..3bf999347f 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -89,9 +89,9 @@ class testsuite extends control
                 $privateNum++;
             }
         }
-        $suitesNum         = !empty(count($suites, 0)) ? count($suites, 0) : 0;
-        $publicNum         = $suitesNum - $privateNum;
-        $summary           = str_replace(array('%total%', '%public%', '%private%'), array($suitesNum, $publicNum, $privateNum), $this->lang->testsuite->summary);
+        $suitesNum = !empty(count($suites, 0)) ? count($suites, 0) : 0;
+        $publicNum = $suitesNum - $privateNum;
+        $summary   = str_replace(array('%total%', '%public%', '%private%'), array($suitesNum, $publicNum, $privateNum), $this->lang->testsuite->summary);
 
         $this->view->title       = $productName . $this->lang->testsuite->common;
         $this->view->position[]  = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $productName);

From 772395f37745fc14c7325987152a1f187c876cf7 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Mon, 10 Oct 2022 10:28:50 +0800
Subject: [PATCH 37/42] * rm .swp

---
 module/task/css/.create.css.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 module/task/css/.create.css.swp

diff --git a/module/task/css/.create.css.swp b/module/task/css/.create.css.swp
deleted file mode 100644
index 47a60a3709e54cbf4026101c42295141563734bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&u<$=6vwBz@Uwv6*vo5OL@C*|9Ve-=Arh@BQKX&-h3j}{Y)`Yhv+Rs(CswHh
zSN;f)xbz?3!e79dzo6pG3H|`Sv%B6nvD1WO(8T^`*WUN$z4^?Ww~DfZ)}sdxsT;N#
ze%@j1>+kPH&u`siU;MJcraT=T$wVr5?Il08U680$Wzkut%_lr>PN&o6Y&Hm|M@gu4
z7DiF?NT!zSEHTYQi%Be-mYaiSWK1*4CATuf=~-j??>zxe-~t3Db{KT8vd&h!<*XYw
zuG4$(esuvyZ{i7f0-k^;;0bsFo`5Id33vkk7XmiB!k%F=8`Xq9sE$`o9jlN2;0bsF
zo`5Id33vjYfG6Mycmke)C*TQq0+)~g7mR)P3S+ykB6<A(fARPK&u=sK6J($p(2KVi
z8$uGg3H@`GvA?0;p=Zzr^v9cwJ%VmQ8_@GN82bTw0DTU92)%fnv0tG>Xa;=)eF}X7
zU4#C74Svu==o<7F^7;+>5mHc*=OyIqQ}zTr0Z+ga@B}V7frjOHn}dDHllwwhos-2|
zP#BH1k!fI5I*KLD$5M^Pw%6IsW>49Qi>M9AS@hSK<TTH?5E!mU-E2m8pz7$%@w6b1
zT^1A;r@=sr!zGvY7VJCj*H)_xu;LNv)Z*#GC8rj(Xs57l-llUx1XgD~a$)*U>2`BX
zMq|l^%oq7tWgV9xf&$W!gl`AF6zN#!J!*8K?aof8Pq9j6P|>5U?K5((#$I5iZD&X|
zur}sQt+kwl;;|kr^LKn`s)QZ)Xt$yj9!Qx5xt><3EZG+`W-N??@`=ru=9P2Xg+)+z
zX%btN#d06DvT_{;WwGSaz|PPfW*v^X2~s%?tTZ+pqk3XjK@z31Kr|c<i_y<;KJB=9
zejKd5Hp(iU_9&Mzx9W*pT9R(}e&^nKAvf_roeTXXHpAgvJtIt?8>2?46#M#k@~wh%
zy+o*Iw?3ym1)h05_Sr6hu2^Nc+N70lk%UU%zvdE;+$2ps@|`mVPI<BvezA2<Bx(5o
zg*=#8tJ82`Q<@KSjzaIzx-m=Zsz<0ao7iBK>q$o8(uV*WUDpEzu^d`#50tRcu@ck}
zk$d&23>4%=YguD(n&)!xBHVw-wJOm_CmG-^D%SN3jvbmW8r|YT+4uJ9kCNxnnC3;3
zX!WT|8E56>ioLl8>&a$XM?+1WY_AtZe%wRL#bF^zConRWk?Y-i6pCDDLQm5mk?CZq
z7cTblY5QWu>ncXKEV}Y_m1H`%JhgQzX}4PMqrzDOBhW|n436i7;A>~)I%`n_LC%Gm
z7!(#Qk6%^6K%)Yaml&cNBAp!;`!Xn&zsH9b9eFO4$zp!kqd}~rgL-w!{zb)_mA8Sg
z=-Oq)hPnK9qH;7OB)&L5XT+_KU2i>az?DH#oyr28%l~e%)9Rhubqh%Y9v!%Sl!~D4
oj_n~{ebT5`Wih!nZcMn3eI_1HjHRKwRl9E7*lzE@47aR*0k8%1q5uE@


From aeb4bef5bc4036a9414c7c83052a4048346a69b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Mon, 10 Oct 2022 10:33:40 +0800
Subject: [PATCH 38/42] * Modify execution page style.

---
 module/execution/model.php  | 2 +-
 www/theme/default/style.css | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 8259a1d99c..09574ea842 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4603,7 +4603,7 @@ class executionModel extends model
 
         $burns = join(',', $execution->burns);
         echo "<tr $trAttrs class='$trClass'>";
-        echo "<td><span id=$execution->id class='table-nest-icon icon table-nest-toggle'></span>";
+        echo "<td class='c-name text-left flex sort-handler'><span id=$execution->id class='table-nest-icon icon table-nest-toggle'></span>";
         if($this->config->systemMode == 'new')
         {
             $spanClass = $execution->type == 'stage' ? 'label-warning' : 'label-info';
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index b31be160e3..43a9cb0ba7 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -139,12 +139,9 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
 #toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);}
 #toggleFold.collapsed > .icon {transform: rotate(90deg);}
 
+#executionTableList .c-name .label-danger {position: absolute; top: 8px; right: 0px;}
 #programTableList .c-name .label-danger {position: absolute; right: 4px; padding: 2px 4px;}
 
-#projectForm .c-name,
-#executionTableList .c-name,
-#programTableList .c-name {padding-right: 64px;}
-
 .table .table-children,
 .table .is-nest-child {background: #F8F8F8;}
-.table tbody td.has-child .icon-angle-right {color: #838a9d;}
\ No newline at end of file
+.table tbody td.has-child .icon-angle-right {color: #838a9d;}

From 150beef775a9a15ad89fa6edf8272ddb6bbc911d Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 10 Oct 2022 02:51:03 +0000
Subject: [PATCH 39/42] * finish task *71875

---
 module/execution/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index 82dda40697..f14bd946b5 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -177,11 +177,11 @@ $config->execution->gantt->linkType['begin']['end']   = 3;
 $config->execution->datatable = new stdclass();
 if($config->systemMode == 'new')
 {
-    $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+    $config->execution->datatable->defaultField = array('id', 'name', 'project', 'status', 'PM', 'begin', 'end', 'estimate', 'consumed', 'left', 'progress', 'burn');
 }
 else
 {
-    $config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+    $config->execution->datatable->defaultField = array('id', 'name', 'status', 'PM', 'begin', 'end', 'estimate', 'consumed', 'left', 'progress', 'burn');
 }
 
 $config->execution->datatable->fieldList['id']['title']    = 'idAB';

From 24cad9ceda65547b5fae88de55346aedc90f82ae Mon Sep 17 00:00:00 2001
From: denghongtao <denghongtao@easycorp.ltd>
Date: Mon, 10 Oct 2022 03:00:41 +0000
Subject: [PATCH 40/42] * Fix checkpriv and create unittest.

---
 test/class/repo.class.php     |  5 ++---
 test/model/repo/checkpriv.php |  4 ++--
 test/model/repo/create.php    | 14 ++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/test/class/repo.class.php b/test/class/repo.class.php
index c8acfe550e..f883ab0e73 100644
--- a/test/class/repo.class.php
+++ b/test/class/repo.class.php
@@ -68,10 +68,9 @@ class repoTest
 
     public function createTest($list)
     {
-        $create    = array();
-        $getCreate = array('SCM' => '', 'serviceHost' => '', 'serviceProject' => '', 'name' => '', 'path' => '', 'encoding' => '', 'client' => '', 'account' => '', 'password' => '', 'encrypt' => '', 'desc' => '', 'uid' => '');
+        $init = array('SCM' => '', 'serviceHost' => '', 'serviceProject' => '', 'name' => '', 'path' => '', 'encoding' => '', 'client' => '', 'account' => '', 'password' => '', 'encrypt' => '', 'desc' => '', 'uid' => '');
 
-        foreach($getCreate as $filed => $defaultvalue) $_POST[$filed] = $defaultvalue;
+        foreach($init as $filed => $defaultvalue) $_POST[$filed] = $defaultvalue;
         foreach($list as $key => $value) $_POST[$key] = $value;
 
         $objects = $this->objectModel->create();
diff --git a/test/model/repo/checkpriv.php b/test/model/repo/checkpriv.php
index a7a980c74b..5311237ab7 100755
--- a/test/model/repo/checkpriv.php
+++ b/test/model/repo/checkpriv.php
@@ -10,7 +10,7 @@ title=测试 repoModel->checkPriv();
 cid=1
 pid=1
 
- >> 0
+检查用户权限，返回布尔值 >> 0
 
 */
 
@@ -22,4 +22,4 @@ $repo->acl->user   = 'admin';
 
 $result = $checkPriv->checkPrivTest($repo);
 
-r($result) && p($result) && e('0');
\ No newline at end of file
+r($result) && p($result) && e('0'); //检查用户权限，返回布尔值
\ No newline at end of file
diff --git a/test/model/repo/create.php b/test/model/repo/create.php
index bc42977edc..2e3b0a84c0 100755
--- a/test/model/repo/create.php
+++ b/test/model/repo/create.php
@@ -10,9 +10,9 @@ title=测试 repoModel->create();
 cid=1
 pid=1
 
- >> 1
- >> 『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
- >> 因为安全原因，需要检测客户端版本，请将版本号写入文件
+正常创建gitlab版本库 >> 1
+当已有版本库时提示已有记录 >> 『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
+当数据类型为Gitea时提示写版本号 >> 因为安全原因，需要检测客户端版本，请将版本号写入文件
 
 */
 
@@ -53,6 +53,8 @@ $resultOne   = $repo->createTest($list);
 $resultTwo   = $repo->createTest($list);
 $resultThree = $repo->createTest($listOne);
 
-r($resultOne)   && p($resultOne)   && e('1');
-r($resultTwo)   && p('name:0')     && e('『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。');
-r($resultThree) && p($resultThree) && e('因为安全原因，需要检测客户端版本，请将版本号写入文件');
\ No newline at end of file
+r($resultOne)   && p($resultOne)   && e('1');                                                                                           //正常创建gitlab版本库
+r($resultTwo)   && p('name:0')     && e('『名称』已经有『jktest』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); //当已有版本库时提示已有记录
+r($resultThree) && p($resultThree) && e('因为安全原因，需要检测客户端版本，请将版本号写入文件');                                        //当数据类型为Gitea时提示写版本号
+
+$db->restoreDB();
\ No newline at end of file

From 20a77c481183e21e084ad250b32fd50e4e1d4bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= <caoyanyi@easycorp.ltd>
Date: Mon, 10 Oct 2022 11:05:49 +0800
Subject: [PATCH 41/42] * Modify language.

---
 module/execution/lang/de.php       |  2 +-
 module/execution/lang/en.php       |  6 +++---
 module/execution/lang/zh-cn.php    |  2 +-
 module/execution/view/all.html.php | 18 +++++++++++-------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 12ce2c0a86..7dd60f3ce2 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -419,7 +419,7 @@ $lang->execution->storyDragError              = "The {$lang->SRCommon} is not ac
 $lang->execution->countTip                    = ' (%s member)';
 $lang->execution->pleaseInput                 = "Enter";
 $lang->execution->week                        = 'week';
-$lang->execution->checkedExecutions           = 'Seleted %s executions.';
+$lang->execution->checkedExecutions           = "Seleted %s {$lang->executionCommon}.";
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 9f155eb2aa..8befda23c8 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -342,8 +342,8 @@ $lang->execution->stats                = 'Available: <strong>%s</strong>(h). Est
 $lang->execution->taskSummary          = "Total tasks on this page:<strong>%s</strong>. Waiting: <strong>%s</strong>. Doing: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).";
 $lang->execution->pageSummary          = "Total tasks: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
 $lang->execution->checkedSummary       = "Selected: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
-$lang->execution->executionSummary     = "Total executions: <strong>%s</strong>.";
-$lang->execution->pageExecSummary      = "Total executions: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.";
+$lang->execution->executionSummary     = "Total {$lang->executionCommon}: <strong>%s</strong>.";
+$lang->execution->pageExecSummary      = "Total {$lang->executionCommon}: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.";
 $lang->execution->checkedExecSummary   = "Selected: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.";
 $lang->execution->memberHoursAB        = "%s has <strong>%s</ strong> hours.";
 $lang->execution->memberHours          = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Available Hours</div><div class="segment-value">%s</div></div></div></div>';
@@ -419,7 +419,7 @@ $lang->execution->storyDragError              = "The {$lang->SRCommon} is not ac
 $lang->execution->countTip                    = ' (%s member)';
 $lang->execution->pleaseInput                 = "Enter";
 $lang->execution->week                        = 'week';
-$lang->execution->checkedExecutions           = 'Seleted %s executions.';
+$lang->execution->checkedExecutions           = "Seleted %s {$lang->executionCommon}.";
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index e2b6c7b3c3..12a9d17a87 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -419,7 +419,7 @@ $lang->execution->storyDragError              = "该{$lang->SRCommon}不是激
 $lang->execution->countTip                    = '（%s人）';
 $lang->execution->pleaseInput                 = "请输入";
 $lang->execution->week                        = '周';
-$lang->execution->checkedExecutions           = "共选中%s个{$lang->execution->common}。";
+$lang->execution->checkedExecutions           = "共选中%s个{$lang->executionCommon}。";
 
 /* 统计。*/
 $lang->execution->charts = new stdclass();
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index b072f3a78e..0e1283510f 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -16,13 +16,17 @@
 $datatableId  = $this->moduleName . ucfirst($this->methodName);
 $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
 ?>
-<?php js::set('unfoldExecutions', array());?>
-<?php js::set('useDatatable', $useDatatable);?>
-<?php js::set('from', $from);?>
-<?php js::set('checkedSummary', $lang->execution->checkedExecSummary);?>
-<?php js::set('pageSummary', $lang->execution->pageExecSummary);?>
-<?php js::set('executionSummary', $lang->execution->executionSummary);?>
-<?php js::set('checkedExecutions', $lang->execution->checkedExecutions);?>
+<?php
+js::set('unfoldExecutions', array());
+js::set('useDatatable', $useDatatable);
+js::set('from', $from);
+
+/* Replace Iteration to Execution. */
+js::set('checkedSummary', str_replace($lang->executionCommon, $lang->execution->common, $lang->execution->checkedExecSummary));
+js::set('pageSummary', str_replace($lang->executionCommon, $lang->execution->common, $lang->execution->pageExecSummary));
+js::set('executionSummary', str_replace($lang->executionCommon, $lang->execution->common, $lang->execution->executionSummary));
+js::set('checkedExecutions', str_replace($lang->executionCommon, $lang->execution->common, $lang->execution->checkedExecutions));
+?>
 <?php
 /* Set unfold parent executionID. */
 js::set('unfoldAll', $lang->execution->treeLevel['all']);

From 7571484ba72cd1acfecc100dce99a314171ac6ee Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 10 Oct 2022 03:11:30 +0000
Subject: [PATCH 42/42] *Adjust code for bug #26245.

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

diff --git a/module/task/control.php b/module/task/control.php
index 6f198e7b8e..13a18581cc 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -301,7 +301,7 @@ class task extends control
             {
                 foreach($executionList as $key => $val)
                 {
-                    $values      = str_replace($replace, $project->name, $val);
+                    $values = str_replace($replace, $project->name, $val);
                     $executionAll[$key] = $values;
                 }
             }