From 1df67f68c04528240817113ecd347f4f27a3a520 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 27 Aug 2021 16:19:03 +0800
Subject: [PATCH 1/7] * Finish task #41690. Fix bug #14291.

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

diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php
index 855b0cac26..f5131c3497 100644
--- a/module/block/view/qastatisticblock.html.php
+++ b/module/block/view/qastatisticblock.html.php
@@ -81,6 +81,8 @@ $(function()
         $tab.find('.progress-pie').progressPie();
         $(this).parents('.tab-pane').find('.table-row').not($tab).addClass('hidden');
     });
+
+    $('.progress-pie').progressPie();
 });
 </script>
 <div class="panel-body block-qa">

From 75faca9e87fd723821cfd7a1be43c7e6f32e390e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 27 Aug 2021 16:21:43 +0800
Subject: [PATCH 2/7] * Revert commit.

---
 module/testsuite/control.php            | 4 +---
 module/testsuite/view/linkcase.html.php | 3 +--
 module/testsuite/view/view.html.php     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index b4c506037f..2fd00bc077 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -294,11 +294,10 @@ class testsuite extends control
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
-     * @param  string $from
      * @access public
      * @return void
      */
-    public function linkCase($suiteID, $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1, $from = 'browse')
+    public function linkCase($suiteID, $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
         $this->session->set('caseList', $this->app->getURI(true), 'qa');
@@ -342,7 +341,6 @@ class testsuite extends control
         $this->view->suiteID = $suiteID;
         $this->view->pager   = $pager;
         $this->view->suite   = $suite;
-        $this->view->from    = $from;
 
         $this->display();
     }
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 28a1f6d3aa..e70bb6b157 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -15,8 +15,7 @@
 <?php js::set('flow', $config->global->flow);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php $browseLink = $from == 'view' ? $this->inlink('view', "suiteID=$suiteID") : $this->session->testsuiteList;?>
-    <?php common::printBack($browseLink, 'btn btn-link');?>
+    <?php common::printBack($this->session->testsuiteList, 'btn btn-link');?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $suite->id;?></span>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index fa6ed16258..c9730c2fe2 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -33,7 +33,7 @@
     {
         echo $this->buildOperateMenu($suite, 'view');
 
-        common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id&param=0&recTotal=0&recPerPage=20&pageID=1&from=view", $suite, 'button', 'link');
+        common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'button', 'link');
         common::printIcon('testsuite', 'edit',     "suiteID=$suite->id");
         common::printIcon('testsuite', 'delete',   "suiteID=$suite->id", '', 'button', 'trash', 'hiddenwin');
     }

From 7eb5c6142c4685ea473c0212fc6668fefe8c6912 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 27 Aug 2021 16:40:43 +0800
Subject: [PATCH 3/7]  * Code for task #41764.

---
 module/bug/css/batchactivate.css       |  4 +++
 module/bug/css/batchcreate.css         |  6 +++++
 module/bug/css/batchedit.css           |  7 +++++
 module/bug/view/batchactivate.html.php |  8 +++---
 module/bug/view/batchcreate.html.php   | 28 ++++++++++----------
 module/bug/view/batchedit.html.php     | 36 +++++++++++++-------------
 module/bug/view/linkbugs.html.php      |  8 +++---
 module/company/css/dynamic.css         |  3 +++
 module/company/view/dynamic.html.php   | 10 +++----
 module/compile/css/browse.css          |  3 +++
 module/compile/view/browse.html.php    | 12 ++++-----
 module/cron/css/index.css              |  5 ++++
 module/cron/view/index.html.php        | 18 ++++++-------
 www/theme/default/style.css            |  2 +-
 14 files changed, 89 insertions(+), 61 deletions(-)
 create mode 100644 module/bug/css/batchactivate.css
 create mode 100644 module/compile/css/browse.css
 create mode 100644 module/cron/css/index.css

diff --git a/module/bug/css/batchactivate.css b/module/bug/css/batchactivate.css
new file mode 100644
index 0000000000..808c59e64b
--- /dev/null
+++ b/module/bug/css/batchactivate.css
@@ -0,0 +1,4 @@
+.c-id {width: 40px !important;}
+.c-title {width: 160px;}
+.c-assigned {width: 160px;}
+.c-build {width: 160px;}
diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css
index e69de29bb2..30412ed704 100644
--- a/module/bug/css/batchcreate.css
+++ b/module/bug/css/batchcreate.css
@@ -0,0 +1,6 @@
+.c-id {width: 50px !important;}
+.c-branch, .c-module, .c-os {width: 120px;}
+.c-execution {width: 130px;}
+.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
+.c-steps {width: 150px;}
+.c-pri, .c-severity {width: 80px;}
diff --git a/module/bug/css/batchedit.css b/module/bug/css/batchedit.css
index 18e25bbcab..b928b1c4ac 100644
--- a/module/bug/css/batchedit.css
+++ b/module/bug/css/batchedit.css
@@ -1,2 +1,9 @@
 .duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px;}
 .duplicate-input:focus {border-left-width: 1px; padding-left: 8px;}
+
+.c-id {width: 50px !important;}
+.c-branch, .c-module, .c-os {width: 120px;}
+.c-execution {width: 130px;}
+.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
+.c-steps, .c-title, .c-plan, .c-assigned, .c-resolution {width: 150px;}
+.c-pri, .c-severity {width: 80px;}
diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php
index 5090cf657d..7d861c682a 100644
--- a/module/bug/view/batchactivate.html.php
+++ b/module/bug/view/batchactivate.html.php
@@ -19,10 +19,10 @@
     <table class='table table-form table-fixed'>
       <thead>
         <tr>
-          <th class='w-40px'><?php echo $lang->idAB;?></th>
-          <th class='w-160px'><?php echo $lang->bug->title;?></th>
-          <th class='w-120px'><?php echo $lang->bug->assignedTo;?></th>
-          <th class='w-200px'><?php echo $lang->bug->openedBuild;?></th>
+          <th class='c-id'><?php echo $lang->idAB;?></th>
+          <th class='c-title'><?php echo $lang->bug->title;?></th>
+          <th class='c-assigned'><?php echo $lang->bug->assignedTo;?></th>
+          <th class='c-build'><?php echo $lang->bug->openedBuild;?></th>
           <th><?php echo $lang->bug->legendComment;?></th>
         </tr>
       </thead>
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index a2d3a68f29..26e6b3cfda 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -46,23 +46,23 @@
       <table class='table table-form'>
         <thead>
           <tr>
-            <th class='w-50px'><?php echo $lang->idAB;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
-            <th class='w-120px<?php echo zget($requiredFields, 'module', '', ' required');?>'> <?php echo $lang->bug->module;?></th>
-            <th class='w-130px<?php echo zget($visibleFields, 'execution', ' hidden') . zget($requiredFields, 'execution', '', ' required');?>'><?php echo $lang->bug->execution;?></th>
-            <th class='w-100px required'><?php echo $lang->bug->openedBuild;?></th>
+            <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='c-branch<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
+            <th class='c-module<?php echo zget($requiredFields, 'module', '', ' required');?>'> <?php echo $lang->bug->module;?></th>
+            <th class='c-execution<?php echo zget($visibleFields, 'execution', ' hidden') . zget($requiredFields, 'execution', '', ' required');?>'><?php echo $lang->bug->execution;?></th>
+            <th class='c-build required'><?php echo $lang->bug->openedBuild;?></th>
             <th class='c-title required'><?php echo $lang->bug->title;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'steps', ' hidden') . zget($requiredFields, 'steps', '', ' required');?>'><?php echo $lang->bug->steps;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->typeAB;?></th>
-            <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
-            <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
+            <th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
+            <th class='c-steps<?php echo zget($visibleFields, 'steps', ' hidden') . zget($requiredFields, 'steps', '', ' required');?>'><?php echo $lang->bug->steps;?></th>
+            <th class='c-type<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->typeAB;?></th>
+            <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
+            <th class='c-severity<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
+            <th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
+            <th class='c-browser<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
+            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
             <?php
             $extendFields = $this->bug->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 0cd8db28cf..490f027efa 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -47,26 +47,26 @@
       <table class='table table-form'>
         <thead>
           <tr>
-            <th class='w-50px'><?php echo $lang->idAB;?></th>
-            <th class='w-110px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->bug->type;?></th>
-            <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
-            <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
-            <th class="required <?php if(count($visibleFields) >= 10) echo ' w-150px';?>"><?php echo $lang->bug->title;?></th>
+            <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='c-type<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->bug->type;?></th>
+            <th class='c-severity<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
+            <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
+            <th class="required <?php if(count($visibleFields) >= 10) echo ' c-title';?>"><?php echo $lang->bug->title;?></th>
             <?php if($branchProduct):?>
-            <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->bug->branch;?></th>
+            <th class='c-branch<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->bug->branch;?></th>
             <?php endif;?>
-            <th class='w-150px<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
-            <th class='w-90px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
+            <th class='c-plan<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
+            <th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
+            <th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
+            <th class='c-status<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
+            <th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
+            <th class='c-browser<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
+            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
+            <th class='c-user<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
+            <th class='c-resolution<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
             <?php
             $extendFields = $this->bug->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>
@@ -77,10 +77,10 @@
           if(!$productID)
           {
               $product = $this->product->getByID($bug->product);
-    
+
               $plans = $this->loadModel('productplan')->getPairs($bug->product, $branch);
               $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
-    
+
               $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
               if($product->type != 'normal')
               {
diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index d74a98e619..b6d6e378aa 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -35,9 +35,9 @@
           <th class='c-pri'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->product;?></th>
           <th><?php echo $lang->bug->title;?></th>
-          <th class='w-status'><?php echo $lang->bug->statusAB;?></th>
-          <th class='w-100px'><?php echo $lang->openedByAB;?></th>
-          <th class='w-100px'><?php echo $lang->assignedToAB;?></th>
+          <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-user'><?php echo $lang->assignedToAB;?></th>
         </tr>
       </thead>
       <tbody>
@@ -47,7 +47,7 @@
         <tr>
           <td class='c-id'>
             <div class="checkbox-primary">
-              <input type='checkbox' name='bugs[]'  value='<?php echo $bug2Link->id;?>'/> 
+              <input type='checkbox' name='bugs[]'  value='<?php echo $bug2Link->id;?>'/>
               <label></label>
             </div>
             <?php printf('%03d', $bug2Link->id);?>
diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index c11b53e924..eeb6571277 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -17,3 +17,6 @@
 .dynamic.collapsed .timeline {max-height: 58px;}
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
+
+.c-user, .c-project, .c-product, .c-execution {width: 150px !important;}
+.c-date {width: 200px;}
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 591a73a589..721d080d51 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -25,12 +25,12 @@
     echo html::a(inlink('dynamic', "browseType=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
     ?>
     <?php endforeach;?>
-    <div class="input-control space w-150px"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
-    <div class="input-control space w-150px"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space c-user"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space c-product"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
     <?php if($config->systemMode == 'new'):?>
-    <div class="input-control space w-150px"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space c-project"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
     <?php endif;?>
-    <div class="input-control space w-150px"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
+    <div class="input-control space c-execution"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
   </div>
 </div>
@@ -42,7 +42,7 @@
     <?php foreach($dateGroups as $date => $actions):?>
     <?php $isToday = date(DT_DATE4) == $date;?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
-      <div class="dynamic-date <?php if($browseType == 'all') echo 'w-200px';?>">
+      <div class="dynamic-date <?php if($browseType == 'all') echo 'c-date';?>">
         <?php if($isToday):?>
         <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
         <?php endif;?>
diff --git a/module/compile/css/browse.css b/module/compile/css/browse.css
new file mode 100644
index 0000000000..8e03463502
--- /dev/null
+++ b/module/compile/css/browse.css
@@ -0,0 +1,3 @@
+.c-id {width: 60px;}
+.c-repo, .c-build-type {width: 150px;}
+.c-date, .c-actions {width: 130px !important;}
diff --git a/module/compile/view/browse.html.php b/module/compile/view/browse.html.php
index 91588ca7c3..5dd9c2a77d 100644
--- a/module/compile/view/browse.html.php
+++ b/module/compile/view/browse.html.php
@@ -30,14 +30,14 @@
       <thead>
         <tr class='text-center'>
           <?php $vars = "jobID={$jobID}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-          <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->compile->id);?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->compile->id);?></th>
           <th class='text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->compile->name);?></th>
-          <th class='w-150px text-left'><?php echo $lang->compile->buildType;?></th>
-          <th class='w-150px text-left'><?php echo $lang->job->repo;?></th>
+          <th class='c-build-type text-left'><?php echo $lang->compile->buildType;?></th>
+          <th class='c-repo text-left'><?php echo $lang->job->repo;?></th>
           <th class='text-left'><?php echo $lang->job->triggerType;?></th>
-          <th class='w-80px text-center'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
-          <th class='w-130px text-center'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
-          <th class='w-120px'><?php echo $lang->actions;?></th>
+          <th class='c-status text-center'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
+          <th class='c-date text-center'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
+          <th class='c-actions'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody class='text-left'>
diff --git a/module/cron/css/index.css b/module/cron/css/index.css
new file mode 100644
index 0000000000..6a6a07af08
--- /dev/null
+++ b/module/cron/css/index.css
@@ -0,0 +1,5 @@
+.c-minute {width: 60px;}
+.c-hour, .c-dom {width: 50px;}
+.c-mon, .c-dow, .c-status {width: 60px;}
+.c-remark {width: 200px;}
+.c-actions {width: 100px;}
diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php
index aa9993434d..bedf432683 100644
--- a/module/cron/view/index.html.php
+++ b/module/cron/view/index.html.php
@@ -27,16 +27,16 @@
   <table class='table table-condensed table-bordered table-fixed main-table'>
     <thead>
       <tr>
-        <th class='w-70px text-center'><?php echo $lang->cron->m?></th>
-        <th class='w-50px text-center'><?php echo $lang->cron->h?></th>
-        <th class='w-50px text-center'><?php echo $lang->cron->dom?></th>
-        <th class='w-60px text-center'><?php echo $lang->cron->mon?></th>
-        <th class='w-60px text-center'><?php echo $lang->cron->dow?></th>
+        <th class='c-minute text-center'><?php echo $lang->cron->m?></th>
+        <th class='c-hour text-center'><?php echo $lang->cron->h?></th>
+        <th class='c-dom text-center'><?php echo $lang->cron->dom?></th>
+        <th class='c-mon text-center'><?php echo $lang->cron->mon?></th>
+        <th class='c-dow text-center'><?php echo $lang->cron->dow?></th>
         <th><?php echo $lang->cron->command?></th>
-        <th class='w-200px'><?php echo $lang->cron->remark?></th>
-        <th class='w-130px'><?php echo $lang->cron->lastTime?></th>
-        <th class='w-60px'><?php echo $lang->cron->status?></th>
-        <th class='w-100px'><?php echo $lang->actions;?></th>
+        <th class='c-remark'><?php echo $lang->cron->remark?></th>
+        <th class='c-full-date text-center'><?php echo $lang->cron->lastTime?></th>
+        <th class='c-status text-center'><?php echo $lang->cron->status?></th>
+        <th class='c-actions text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody class='text-center'>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index cb32f08387..9e0e492e40 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -52,7 +52,7 @@ a.showMoreImage:hover {opacity: 1;}
 .c-icon {width: 20px;}
 .c-number {width: 80px;}
 .c-company, .c-budget {width: 80px;}
-.c-status, .c-user, .c-date, .c-encode {width: 100px;}
+.c-status, .c-type, .c-user, .c-date, .c-encode {width: 100px;}
 .c-object-type {width: 130px;}
 .c-full-date, .c-mobile, .c-text {width: 150px;}
 .c-module {width: 180px;}

From f318aa5e989bd62a90b9f4d69e17c7c152677664 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 27 Aug 2021 16:43:00 +0800
Subject: [PATCH 4/7]  * Finish task #41591.

---
 module/repo/control.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/repo/control.php b/module/repo/control.php
index 7e906e4191..0ee1c91b31 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -205,13 +205,12 @@ class repo extends control
     {
         if($confirm == 'no') die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes")));
 
-        $error      = '';
         $relationID = $this->dao->select('id')->from(TABLE_RELATION)
             ->where('extra')->eq($repoID)
             ->andWhere('AType')->eq('design')
             ->fetch();
 
-        if($relationID) $error .= $this->lang->repo->error->deleted;
+        $error = $relationID ? $this->lang->repo->error->deleted : '';
 
         $jobs = $this->dao->select('*')->from(TABLE_JOB)->where('repo')->eq($repoID)->andWhere('deleted')->eq('0')->fetchAll();
         if($jobs) $error .= ($error ? '\n' : '') . $this->lang->repo->error->linkedJob;

From 4e278c4c44a8a0aef424b1e3e64b456e4df7c4b4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 27 Aug 2021 17:01:03 +0800
Subject: [PATCH 5/7] * Finish task #41688.

---
 module/task/js/editestimate.js         | 4 ++++
 module/task/view/editestimate.html.php | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/task/js/editestimate.js b/module/task/js/editestimate.js
index 530f59bc9e..291f3072a6 100644
--- a/module/task/js/editestimate.js
+++ b/module/task/js/editestimate.js
@@ -2,3 +2,7 @@ function confirmLeft()
 {
     if($('#left').val() === '0') return confirm(confirmRecord);
 }
+$(function()
+{
+    $('.form-date').datetimepicker('setEndDate', today);
+})
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index 360b0fc95b..d1e04c210a 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmRecord', $lang->task->confirmRecord);?>
+<?php js::set('today', helper::today());?>
 <div id='mainContent' class='main-content'>
   <div class='center-block mw-600px'>
     <div class='main-header'>
@@ -22,7 +23,7 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->task->date;?></th>
-          <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td>
+          <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date" readonly');?></td>
           <td></td>
         </tr>  
         <tr>

From 2a24e037250b00eb7ea8245f27977259a186951b Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 27 Aug 2021 17:08:07 +0800
Subject: [PATCH 6/7] * Finish task#41709

---
 module/testcase/model.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index c21a664a2c..7a1effe2ed 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1008,13 +1008,17 @@ class testcaseModel extends model
 
         foreach($caseIdList as $caseID)
         {
+            $oldCase = $this->getById($caseID);
+
             $case = new stdClass();
             $case->lastEditedBy   = $this->app->user->account;
             $case->lastEditedDate = $now;
             $case->type           = $result;
 
             $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec();
-            $this->action->create('case', $caseID, 'Edited', '', ucfirst($result));
+            $actionID = $this->action->create('case', $caseID, 'Edited', '', ucfirst($result));
+            $changes  = common::createChanges($oldCase, $case);
+            $this->action->logHistory($actionID, $changes);
         }
     }
 

From 7e4c7dc503961ec12721fa88872347bd9811a0a9 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Fri, 27 Aug 2021 17:43:54 +0800
Subject: [PATCH 7/7] * Fix bug when creating a repo without gitlabProject.

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

diff --git a/module/repo/model.php b/module/repo/model.php
index 2913042990..bb1dbaf823 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -225,7 +225,7 @@ class repoModel extends model
         if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
         $this->dao->insert(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
             ->batchCheck($this->config->repo->create->requiredFields, 'notempty')
-            ->checkIF($data->SCM == 'GitLab', 'gitlabProject', 'notempty')
+            ->checkIF($data->SCM == 'Gitlab', 'gitlabProject', 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
             ->autoCheck()
             ->exec();
@@ -283,7 +283,7 @@ class repoModel extends model
         $this->dao->update(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
             ->batchCheck($this->config->repo->edit->requiredFields, 'notempty')
             ->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
-            ->checkIF($data->SCM == 'GitLab', 'extra', 'notempty')
+            ->checkIF($data->SCM == 'Gitlab', 'extra', 'notempty')
             ->autoCheck()
             ->where('id')->eq($id)->exec();