From fa4d37f1a21493cf9d4bc1efb709c60abaa3185a Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Wed, 10 Aug 2022 03:01:48 +0000
Subject: [PATCH 01/14] * Fix bug #25249

---
 module/execution/model.php | 32 ++++++++++++++++++++------------
 module/task/model.php      | 23 ++++++++---------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 90704f6e09..46a73bc318 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4368,25 +4368,33 @@ class executionModel extends model
             echo "<span class='project-type-label label label-outline $spanClass'>{$this->lang->execution->typeList[$execution->type]}</span> ";
         }
         echo empty($execution->children) ? html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name) : $execution->name;
-        echo '<td>' . zget($users, $execution->PM) . '</td>';
-        echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
-        echo '<td>' . html::ring($execution->hours->progress) . '</td>';
-        echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td class="c-date">' . $execution->begin . '</td>';
-        if(!helper::isZeroDate($execution->end))
+        if(empty($execution->children))
         {
-            if($execution->status != 'closed')
+            echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name);
+            if(!helper::isZeroDate($execution->end))
             {
-                echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed c-date" title="' . $this->lang->execution->delayed . '">' . $execution->end . '</td>' : '<td class="c-date">' . $execution->end . '</td>';
-            }
-            else
-            {
-                echo '<td class="c-date">' . $execution->end . '</td>';
+                if($execution->status != 'closed')
+                {
+                    echo strtotime($today) > strtotime($execution->end) ? '<span class="label label-danger label-badge">' . $this->lang->execution->delayed . '</span>' : '';
+                }
             }
         }
         else
         {
-            echo '<td></td>';
+            echo $execution->name;
+            if(!helper::isZeroDate($execution->end))
+            {
+                if($execution->status != 'closed')
+                {
+                    echo strtotime($today) > strtotime($execution->end) ? '<span class="label label-danger label-badge">' . $this->lang->execution->delayed . '</span>' : '';
+                }
+            }
         }
+        echo '<td>' . zget($users, $execution->PM) . '</td>';
+        echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
+        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>';
diff --git a/module/task/model.php b/module/task/model.php
index e5edc31911..f312bbfc1c 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3805,26 +3805,19 @@ class taskModel extends model
         $list .= '<td>';
         if($task->parent > 0) $list .= '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
         $list .= common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "id=$task->id"), $task->name, '', "style='color: $task->color'", "data-app='project'") : "<span style='color:$task->color'>$task->name</span>";
-        $list .= '</td>';
-        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
-        $list .= "<td class='status-{$task->status}'>" . $this->processStatus('task', $task) . '</td>';
-        $list .= '<td></td>';
-        $list .= helper::isZeroDate($task->estStarted) ? '<td></td>' : '<td>' . $task->estStarted . '</td>';
         if(!helper::isZeroDate($task->deadline))
         {
-            if($task->status != 'done')
+            if($task->status != done)
             {
-                $list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed" ' . 'title="' . $this->lang->execution->delayed . '">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
-            }
-            else
-            {
-                $list .= '<td>' . $task->deadline . '</td>';
+                $list .= strtotime($today) > strtotime($task->deadline) ? '<span class="label label-danger label-badge">' . $this->lang->execution->delayed . '</span>' : '';
             }
         }
-        else
-        {
-            $list .= '<td></td>';
-        }
+        $list .= '</td>';
+        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
+        $list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
+        $list .= '<td></td>';
+        $list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';
+        $list .= helper::isZeroDate($task->deadline) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->deadline . '</td>';
         $list .= '<td>' . $task->estimate . $this->lang->execution->workHourUnit . '</td>';
         $list .= '<td>' . $task->consumed . $this->lang->execution->workHourUnit . '</td>';
         $list .= '<td>' . $task->left . $this->lang->execution->workHourUnit . '</td>';

From 986ff8cb6c102d147b4a5efbe7ffefa45841afbe Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 10 Aug 2022 11:09:20 +0800
Subject: [PATCH 02/14] * Fix bug #26109.

---
 module/execution/js/kanban.js             | 2 +-
 module/execution/view/taskkanban.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 2e3d2f7363..e5b9e41801 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1861,7 +1861,7 @@ function searchCards(value, order = '')
 
         if(hideAll && rdSearchValue != '')
         {
-            if($('.table-empty-tip').length == 0) $('#kanban').append('<div class="table-empty-tip"><p><span class="text-muted">' + kanbanLang.empty + '</span></p></div>');
+            if($('.table-empty-tip').length == 0) $('#kanban').append('<div class="table-empty-tip"><p><span class="text-muted">' + kanbancardLang.empty + '</span></p></div>');
         }
         else
         {
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 8ce420b01a..2a9b390200 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -132,7 +132,7 @@
     <div id='kanbans'></div>
   </div>
   <div class='table-empty-tip hidden' id='emptyBox'>
-    <p><span class="text-muted"><?php echo $lang->kanban->empty?></span></p>
+    <p><span class="text-muted"><?php echo $lang->kanbancard->empty;?></span></p>
   </div>
 </div>
 

From 72f038d37918f24000a00a3b1b34b1f5204118f2 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 10 Aug 2022 11:20:05 +0800
Subject: [PATCH 03/14] * Fix bug of edit execution can change closedDate.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index d51d512938..9c6e4f0bdd 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -501,8 +501,8 @@ class executionModel extends model
             ->setIF(helper::isZeroDate($this->post->begin), 'begin', '')
             ->setIF(helper::isZeroDate($this->post->end), 'end', '')
             ->setIF(!isset($_POST['whitelist']), 'whitelist', '')
-            ->setIF($this->post->status == 'closed', 'closedDate', helper::now())
-            ->setIF($this->post->status == 'suspended', 'suspendedDate', helper::today())
+            ->setIF($this->post->status == 'closed' and $oldExecution->status != 'closed', 'closedDate', helper::now())
+            ->setIF($this->post->status == 'suspended' and $oldExecution->status != 'suspended', 'suspendedDate', helper::today())
             ->setIF($oldExecution->type == 'stage', 'project', $oldExecution->project)
             ->setDefault('team', $this->post->name)
             ->join('whitelist', ',')
@@ -700,8 +700,8 @@ class executionModel extends model
             if(isset($data->codes)) $executions[$executionID]->code = $executionCode;
             if(isset($data->projects))   $executions[$executionID]->project   = zget($data->projects, $executionID, 0);
             if(isset($data->attributes)) $executions[$executionID]->attribute = zget($data->attributes, $executionID, '');
-            if($executions[$executionID]->status == 'closed') $executions[$executionID]->closedDate = helper::now();
-            if($executions[$executionID]->status == 'suspended') $executions[$executionID]->suspendedDate = helper::today();
+            if($executions[$executionID]->status == 'closed' and $oldExecutions[$executionID]->status != 'closed') $executions[$executionID]->closedDate = helper::now();
+            if($executions[$executionID]->status == 'suspended' and $oldExecutions[$executionID]->status != 'suspended') $executions[$executionID]->suspendedDate = helper::today();
 
             /* Check unique code for edited executions. */
             if($projectModel == 'scrum' and isset($executionCode) and empty($executionCode))

From 52cad31920548457b43c0633789d98b12d419aee Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 12:37:14 +0800
Subject: [PATCH 04/14] * Code for port.

---
 db/update17.4.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/update17.4.sql b/db/update17.4.sql
index ff29c01259..c99338e4cc 100644
--- a/db/update17.4.sql
+++ b/db/update17.4.sql
@@ -28,4 +28,5 @@ UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource`
 UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackSolution' ORDER BY `id` DESC LIMIT 1) WHERE `module`='feedback' AND `field`='solution';
 UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackclosedReason' ORDER BY `id` DESC LIMIT 1), `control`='select' WHERE `module`='feedback' AND `field`='closedReason';
 
-UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed';
\ No newline at end of file
+UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed';
+UPDATE `zt_grouppriv` SET `method`='exportTemplate' WHERE `method` = 'exportTemplet';

From e05e56ee704c4b1757d4289f1a66e8225016d9f7 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Wed, 10 Aug 2022 05:16:15 +0000
Subject: [PATCH 05/14]  * Fix bug #26173.

---
 module/upgrade/config.php |  2 ++
 module/upgrade/model.php  | 30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 677663bb20..dbdc6caf0f 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -423,3 +423,5 @@ $config->upgrade->recoveryActions->testcase->review['name']     = $lang->upgrade
 $config->upgrade->recoveryActions->testcase->review['method']   = 'operate';
 $config->upgrade->recoveryActions->testcase->review['open']     = 'normal';
 $config->upgrade->recoveryActions->testcase->review['position'] = 'browseandview';
+
+$config->upgrade->workflowRequiredField = array('product', 'execution', 'program', 'project', 'release', 'story', 'bug', 'task', 'testcase', 'testtask', 'feedback');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d9af99d480..250ebdef98 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -533,7 +533,6 @@ class upgradeModel extends model
             case '17_4':
                 $this->processCreatedInfo();
                 $this->processCreatedBy();
-                $this->updateApproval();
                 break;
         }
 
@@ -679,8 +678,9 @@ class upgradeModel extends model
             case 'biz7.0':
                 $this->processFlowPosition();
                 break;
-            case 'biz7.3':
+            case 'biz7.4':
                 $this->updateApproval();
+                $this->addDefaultRuleToWorkflow();
                 break;
         }
     }
@@ -6880,4 +6880,30 @@ class upgradeModel extends model
 
         return !dao::isError();
     }
+
+    /**
+     * Add requred rule to the built-in workflow status field.
+     *
+     * @access public
+     * @return void
+     */
+    public function addDefaultRuleToWorkflow()
+    {
+        $notemptyRule = $this->dao->select('id')->from(TABLE_WORKFLOWRULE)->where('rule')->eq('notempty')->fetch();
+        if(empty($notemptyRule)) return false;
+
+        $fields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('field')->eq('status')->andWhere('module')->in($this->config->upgrade->workflowRequiredField)->fetchAll();
+
+        foreach($fields as $field)
+        {
+            if(strpos(',' . $field->rules . ',', ',' . $notemptyRule->id . ',') !== false) continue;
+
+            $rules = $notemptyRule->id;
+            if(!empty($field->rules)) $rules = $field->rules . ',' . $rules;
+
+            $this->dao->update(TABLE_WORKFLOWFIELD)->set('rules')->eq($rules)->where('id')->eq($field->id)->exec();
+        }
+
+        return !dao::isError();
+    }
 }

From 0da420f283acdde672f294396cf54eafecf10bd1 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Wed, 10 Aug 2022 05:20:19 +0000
Subject: [PATCH 06/14] * Fix bug #26065

---
 module/kanban/css/space.css       |  2 +-
 module/kanban/js/space.js         | 36 +++++++++++++++++++++++++++++++
 module/kanban/view/space.html.php |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index fafa03aaa0..9b330ee75a 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -25,7 +25,7 @@
 .kanbans .kanban-actions .dropdown-menu.pull-left {top:31px; right:-1px; left: auto;}
 .kanbans .panel .label-closed {background: #AAA !important; color: #FFF; margin-top:-6px;}
 .kanbans .panel-body {padding: 0 16px 16px;}
-.kanbans .kanban-desc {color: #838a9d; word-break:break-all; height: 70px; overflow: hidden; display: -webkit-box; float:left;}
+.kanbans .kanban-desc {color: #838a9d; word-break:break-all; height: 70px; overflow: hidden; float:left;}
 .kanbans .kanban-footer {position: absolute; bottom: 10px; right: 10px; left: 15px;}
 .kanbans .kanban-members {float: left; height: 24px; line-height: 24px;}
 .kanbans .kanban-members > div {display: inline-block; height: 24px;}
diff --git a/module/kanban/js/space.js b/module/kanban/js/space.js
index 260931a56f..4f39482177 100644
--- a/module/kanban/js/space.js
+++ b/module/kanban/js/space.js
@@ -30,3 +30,39 @@ $(function()
         window.location.reload();
     });
 });
+
+(function()
+{
+    /* Expand or collapse text */
+    function limitText()
+    {
+        var fullText;
+        var limitText;
+        var $text   = $(this);
+        var options = $.extend({limitSize: 40, suffix: '…'}, $text.data());
+        var text    = $text.text();
+        if(text.length > options.limitSize)
+        {
+            fullText  = $text.html();
+            limitText = text.substring(0, options.limitSize) + options.suffix;
+            $text.text(limitText).addClass('limit-text-on');
+
+            var $toggleBtn = options.toggleBtn ? $(options.toggleBtn) : $text.next('.text-limit-toggle');
+            $toggleBtn.text($toggleBtn.data('textExpand'));
+            $toggleBtn.on('click', function()
+            {
+                var isLimitOn = $text.toggleClass('limit-text-on').hasClass('limit-text-on');
+                if(isLimitOn) $text.text(limitText);
+                else $text.html(fullText);
+                $toggleBtn.text($toggleBtn.data(isLimitOn ? 'textExpand' : 'textCollapse'));
+            });
+        }
+        else
+        {
+            (options.toggleBtn ? $(options.toggleBtn) : $text.next('.text-limit-toggle')).hide();
+        }
+        $text.removeClass('hidden');
+    };
+    $.fn.textLimit = function(){return this.each(limitText);};
+    $(function(){$('.text-limit').textLimit();});
+})();
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 715a472351..e2b33bf37c 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -50,7 +50,7 @@
           <?php $spaceDescTitle = empty($space->desc) ? $lang->kanban->emptyDesc : str_replace("\n", '', strip_tags($space->desc));?>
           <?php $pattern        = '/<br[^>]*>|<img[^>]*>/';?>
           <?php $spaceDesc      = empty($space->desc) ? $lang->kanban->emptyDesc : preg_replace($pattern, '', $space->desc);?>
-          <p class="spaceDesc text-ellipsis text-primary" title='<?php echo $spaceDescTitle;?>'><?php echo $spaceDesc;?></p>
+          <p><div><span class="text-limit hidden" data-limit-size="40"><?php echo $spaceDesc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div></p>
         </div>
         <div class='spaceActions pull-right'>
           <?php $class = $space->status == 'closed' ? 'disabled' : '';?>

From 3317e702039ac7c7cbbefa60c831f9c2c39b0bf4 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:20:37 +0800
Subject: [PATCH 07/14] * Code for port.

---
 module/port/model.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/port/model.php b/module/port/model.php
index 4b4974ebcd..3e664c4401 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -600,28 +600,27 @@ class portModel extends model
         {
             foreach($values as $field => $value)
             {
-                if(empty($value)) continue;
                 if(in_array($field, $dataSourceList))
                 {
                     if($fieldList[$field]['control'] == 'multiple')
                     {
-                        $value = explode(',', $value);
                         $multiple = '';
-                        foreach($value as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
+                        $multipleLsit = explode(',', $value);
+                        foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
                         $rows[$id]->$field = $multiple;
                     }
                     else
                     {
-                        $rows[$id]->$field = zget($exportDatas[$field], $value);
+                        $rows[$id]->$field = zget($exportDatas[$field], $value, '');
                     }
                 }
                 elseif(strpos($this->config->port->userFields, $field) !== false)
                 {
-                    $rows[$id]->$field = zget($exportDatas['user'], $value);
+                    $rows[$id]->$field = zget($exportDatas['user'], $value, '');
                 }
 
                 /* if value = 0 or value = 0000:00:00 set value = ''*/
-                if(!$value or helper::isZeroDate($value))
+                if(helper::isZeroDate($value))
                 {
                     $rows[$id]->$field = '';
                 }

From 824b9219d905005495c949dca8db0eadeeb5278d Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:34:57 +0800
Subject: [PATCH 08/14] * Code for gantt.

---
 module/common/view/gantt.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/view/gantt.html.php b/module/common/view/gantt.html.php
index ec81e3d8c0..76ec9eca20 100644
--- a/module/common/view/gantt.html.php
+++ b/module/common/view/gantt.html.php
@@ -16,6 +16,7 @@ if($currentLang != 'en') js::import($jsRoot . 'dhtmlxgantt/lang/' . $currentLang
 ?>
 <style>
 .gantt_message_area{display:none;}
+#ganttPris:hover{background:unset;color:unset;cursor: unset;}
 </style>
 <script>
 gantt.plugins({

From d80080b67b038328ab2c8521ef85b41a1aaa5ad0 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:39:35 +0800
Subject: [PATCH 09/14] * Fix bug #25319.

---
 module/admin/lang/de.php        | 6 +++---
 module/admin/lang/en.php        | 6 +++---
 module/admin/lang/fr.php        | 8 ++++----
 module/admin/view/safe.html.php | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 079865be1f..08d2525203 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -69,7 +69,7 @@ $lang->admin->safe->modeList[0] = 'N/A';
 $lang->admin->safe->modeList[1] = 'Medium';
 $lang->admin->safe->modeList[2] = 'Stark';
 
-$lang->admin->safe->modeRuleList[1] = 'Beinhaltet Groß und Kleinbuchstaben sowie Ziffern. Länge >= 6';
+$lang->admin->safe->modeRuleList[1] = 'Beinhaltet Groß und Kleinbuchstaben sowie Ziffern. Länge >= 6.';
 $lang->admin->safe->modeRuleList[2] = 'Beinhaltet Groß und Kleinbuchstaben, Ziffern sowie Sonderzeichen.  Länge >= 10.';
 
 $lang->admin->safe->reasonList['weak']     = 'Bekannte Schwache Passwörter';
@@ -87,5 +87,5 @@ $lang->admin->safe->loginCaptchaList[0] = 'Nein';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
-$lang->admin->safe->noticeStrong = '';
+$lang->admin->safe->noticeMode   = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index afeddcd82c..299127be72 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -69,7 +69,7 @@ $lang->admin->safe->modeList[0] = 'I don\'t care.';
 $lang->admin->safe->modeList[1] = 'Medium';
 $lang->admin->safe->modeList[2] = 'Strong';
 
-$lang->admin->safe->modeRuleList[1] = ' >= 6 upper and lower case, and numbers';
+$lang->admin->safe->modeRuleList[1] = ' >= 6 upper and lower case, and numbers.';
 $lang->admin->safe->modeRuleList[2] = ' >= 10 upper and lower case, numbers and special characters.';
 
 $lang->admin->safe->reasonList['weak']     = 'Common Weak Password';
@@ -87,5 +87,5 @@ $lang->admin->safe->loginCaptchaList[0] = 'No';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
-$lang->admin->safe->noticeStrong = '';
+$lang->admin->safe->noticeMode   = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index eee000d75c..023600d939 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -69,8 +69,8 @@ $lang->admin->safe->modeList[0] = "Contrôle Modéré";
 $lang->admin->safe->modeList[1] = 'Contrôle Moyen';
 $lang->admin->safe->modeList[2] = 'Contrôle Fort';
 
-$lang->admin->safe->modeRuleList[1] = ' >= 6 Majuscules, minuscules et chiffres';
-$lang->admin->safe->modeRuleList[2] = ' >= 10 Majuscules, minuscules, chiffres et caractères spéciaux';
+$lang->admin->safe->modeRuleList[1] = ' >= 6 Majuscules, minuscules et chiffres.';
+$lang->admin->safe->modeRuleList[2] = ' >= 10 Majuscules, minuscules, chiffres et caractères spéciaux.';
 
 $lang->admin->safe->reasonList['weak']     = 'Mots de passe faibles courants';
 $lang->admin->safe->reasonList['account']  = 'Identique au compte';
@@ -87,5 +87,5 @@ $lang->admin->safe->loginCaptchaList[0] = 'Non';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = "Le mot de passe sera vérifié quand un utilisateur se connectera ou qu'un utilisateur sera créé ou modifier.";
-$lang->admin->safe->noticeStrong = '';
+$lang->admin->safe->noticeMode   = "Le mot de passe sera vérifié lors de la connexion au système, de la création et de la modification des coordonnées de l'utilisateur, et du changement de mot de passe.";
+$lang->admin->safe->noticeStrong = "Le mot de passe est d'autant plus sécurisé qu'il est long, qu'il contient plus de lettres, de chiffres ou de caractères spéciaux, et que les lettres du mot de passe sont peu répétitives !";
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index bffeeff81c..fef5e8b92b 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -40,7 +40,7 @@
           <tr>
             <th class='thWidth'><?php echo $lang->admin->safe->password?></th>
             <td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
-            <td class='notice'><?php echo $lang->admin->safe->noticeMode?></td>
+            <td class='notice'><?php echo !empty($config->safe->changeWeak) ? $lang->admin->safe->noticeMode : str_replace(array('登录、', 'logging into the system, ', ' connexion au système,'), array('', '', ''), $lang->admin->safe->noticeMode);?></td>
           </tr>
           <tr id='mode1Rule' class='hidden'>
             <th></th>

From e14424eba358281a2cf8351293c4e4bf0dd3f920 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Wed, 10 Aug 2022 05:46:55 +0000
Subject: [PATCH 10/14] * Fix bug #26065

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

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 9b330ee75a..1b58d9edcc 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -18,7 +18,7 @@
 .kanbans .panel {margin: 0 0;  border: 1px solid #DCDCDC; border-radius: 4px; box-shadow: none; cursor: pointer; height: 160px; margin-bottom: 5px;}
 .kanbans .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
 .kanbans .panel-heading {padding: 4px 2px 10px 16px;}
-.kanbans .kanban-name {overflow: hidden; white-space:nowrap; width: 78%; float: left; padding-top: 8px;}
+.kanbans .kanban-name {overflow: hidden; white-space:nowrap; width: 90%; float: left; padding-top: 8px;}
 .kanbans .panel .label-closed {background: #AAA !important; color: #FFF; margin-top:-1px !important;}
 .kanbans .kanban-actions {float: right; visibility: hidden;}
 .kanbans .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;}
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index e2b33bf37c..cd66f70129 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -50,7 +50,7 @@
           <?php $spaceDescTitle = empty($space->desc) ? $lang->kanban->emptyDesc : str_replace("\n", '', strip_tags($space->desc));?>
           <?php $pattern        = '/<br[^>]*>|<img[^>]*>/';?>
           <?php $spaceDesc      = empty($space->desc) ? $lang->kanban->emptyDesc : preg_replace($pattern, '', $space->desc);?>
-          <p><div><span class="text-limit hidden" data-limit-size="40"><?php echo $spaceDesc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div></p>
+          <p><div><span class="text-limit hidden" data-limit-size="20"><?php echo $spaceDesc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div></p>
         </div>
         <div class='spaceActions pull-right'>
           <?php $class = $space->status == 'closed' ? 'disabled' : '';?>

From 880f39ddf099f0c8976fa5dca011577a5e2bdceb Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:48:25 +0800
Subject: [PATCH 11/14] * Fix bug #25319.

---
 module/admin/lang/de.php        | 5 +++--
 module/admin/lang/en.php        | 5 +++--
 module/admin/lang/fr.php        | 5 +++--
 module/admin/lang/zh-cn.php     | 5 +++--
 module/admin/view/safe.html.php | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 08d2525203..f3647127a2 100644
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -87,5 +87,6 @@ $lang->admin->safe->loginCaptchaList[0] = 'Nein';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
-$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
+$lang->admin->safe->noticeMode     = 'The password will be checked when creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeWeakMode = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeStrong   = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 299127be72..ae785bc4f2 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -87,5 +87,6 @@ $lang->admin->safe->loginCaptchaList[0] = 'No';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
-$lang->admin->safe->noticeStrong = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
+$lang->admin->safe->noticeMode     = 'The password will be checked when creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeWeakMode = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
+$lang->admin->safe->noticeStrong   = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 023600d939..f3bb4993ad 100644
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -87,5 +87,6 @@ $lang->admin->safe->loginCaptchaList[0] = 'Non';
 $lang->admin->safe->resetPWDList[1] = 'ON';
 $lang->admin->safe->resetPWDList[0] = 'Off';
 
-$lang->admin->safe->noticeMode   = "Le mot de passe sera vérifié lors de la connexion au système, de la création et de la modification des coordonnées de l'utilisateur, et du changement de mot de passe.";
-$lang->admin->safe->noticeStrong = "Le mot de passe est d'autant plus sécurisé qu'il est long, qu'il contient plus de lettres, de chiffres ou de caractères spéciaux, et que les lettres du mot de passe sont peu répétitives !";
+$lang->admin->safe->noticeMode     = "Le mot de passe sera vérifié lors de la création et de la modification des coordonnées de l'utilisateur, et du changement de mot de passe.";
+$lang->admin->safe->noticeWeakMode = "Le mot de passe sera vérifié lors de la connexion au système, de la création et de la modification des coordonnées de l'utilisateur, et du changement de mot de passe.";
+$lang->admin->safe->noticeStrong   = "Le mot de passe est d'autant plus sécurisé qu'il est long, qu'il contient plus de lettres, de chiffres ou de caractères spéciaux, et que les lettres du mot de passe sont peu répétitives !";
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 24d5afd21a..b0d8e6a8ee 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -87,5 +87,6 @@ $lang->admin->safe->loginCaptchaList[0] = '否';
 $lang->admin->safe->resetPWDList[1] = '开启';
 $lang->admin->safe->resetPWDList[0] = '关闭';
 
-$lang->admin->safe->noticeMode   = '系统会在登录、创建和修改用户、修改密码的时候检查用户口令。';
-$lang->admin->safe->noticeStrong = '密码长度越长，含有大写字母或数字或特殊符号越多，密码字母越不重复，安全度越强！';
+$lang->admin->safe->noticeMode     = '系统会在创建和修改用户、修改密码的时候检查用户口令。';
+$lang->admin->safe->noticeWeakMode = '系统会在登录、创建和修改用户、修改密码的时候检查用户口令。';
+$lang->admin->safe->noticeStrong   = '密码长度越长，含有大写字母或数字或特殊符号越多，密码字母越不重复，安全度越强！';
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index fef5e8b92b..ad335dd1d7 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -40,7 +40,7 @@
           <tr>
             <th class='thWidth'><?php echo $lang->admin->safe->password?></th>
             <td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
-            <td class='notice'><?php echo !empty($config->safe->changeWeak) ? $lang->admin->safe->noticeMode : str_replace(array('登录、', 'logging into the system, ', ' connexion au système,'), array('', '', ''), $lang->admin->safe->noticeMode);?></td>
+            <td class='notice'><?php echo !empty($config->safe->changeWeak) ? $lang->admin->safe->noticeWeakMode : $lang->admin->safe->noticeMode;?></td>
           </tr>
           <tr id='mode1Rule' class='hidden'>
             <th></th>

From 64a77e30754d179834413b0dee4742e5e110a9b9 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Wed, 10 Aug 2022 06:01:31 +0000
Subject: [PATCH 12/14]  * Fix bug #26173.

---
 module/upgrade/config.php | 2 --
 module/upgrade/model.php  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index dbdc6caf0f..677663bb20 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -423,5 +423,3 @@ $config->upgrade->recoveryActions->testcase->review['name']     = $lang->upgrade
 $config->upgrade->recoveryActions->testcase->review['method']   = 'operate';
 $config->upgrade->recoveryActions->testcase->review['open']     = 'normal';
 $config->upgrade->recoveryActions->testcase->review['position'] = 'browseandview';
-
-$config->upgrade->workflowRequiredField = array('product', 'execution', 'program', 'project', 'release', 'story', 'bug', 'task', 'testcase', 'testtask', 'feedback');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 250ebdef98..177771c11c 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -6882,7 +6882,7 @@ class upgradeModel extends model
     }
 
     /**
-     * Add requred rule to the built-in workflow status field.
+     * Add required rule to the built-in workflow status field.
      *
      * @access public
      * @return void
@@ -6892,7 +6892,7 @@ class upgradeModel extends model
         $notemptyRule = $this->dao->select('id')->from(TABLE_WORKFLOWRULE)->where('rule')->eq('notempty')->fetch();
         if(empty($notemptyRule)) return false;
 
-        $fields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('field')->eq('status')->andWhere('module')->in($this->config->upgrade->workflowRequiredField)->fetchAll();
+        $fields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('field')->eq('status')->andWhere('buildin')->eq(1)->fetchAll();
 
         foreach($fields as $field)
         {

From 7a3f67b1e0785b0f0e766b17ff6c467b89ba1a6a Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 10 Aug 2022 14:32:29 +0800
Subject: [PATCH 13/14] * Finish task #63796.

---
 module/programplan/config.php          |  4 +++
 module/programplan/control.php         |  5 +++
 module/programplan/lang/de.php         | 10 ++++++
 module/programplan/lang/en.php         | 10 ++++++
 module/programplan/lang/fr.php         | 10 ++++++
 module/programplan/lang/zh-cn.php      | 10 ++++++
 module/programplan/view/gantt.html.php | 42 ++++++++++++++------------
 7 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/module/programplan/config.php b/module/programplan/config.php
index 0e389c5004..ce9a1594fa 100644
--- a/module/programplan/config.php
+++ b/module/programplan/config.php
@@ -57,3 +57,7 @@ $config->programplan->customCreateFields = 'PM,percent,attribute,acl,milestone,r
 
 $config->programplan->custom = new stdclass();
 $config->programplan->custom->createFields = 'PM,percent,attribute,acl,milestone';
+
+$config->programplan->custom->customGanttFields = 'PM,deadline,status,realBegan,realEnd,progress,taskProgress,estimate,consumed';
+$config->programplan->ganttCustom = new stdclass();
+$config->programplan->ganttCustom->ganttFields = 'PM,deadline';
diff --git a/module/programplan/control.php b/module/programplan/control.php
index fbea0a2faa..9180048d29 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -84,6 +84,11 @@ class programplan extends control
             if(strpos($selectCustom, 'date') !== false) $dateDetails = 0;
 
             $plans = $this->programplan->getDataForGantt($projectID, $this->productID, $baselineID, $selectCustom, false);
+
+            /* Set Custom. */
+            foreach(explode(',', $this->config->programplan->custom->customGanttFields) as $field) $customFields[$field] = $this->lang->programplan->ganttCustom[$field];
+            $this->view->customFields = $customFields;
+            $this->view->showFields   = $this->config->programplan->ganttCustom->ganttFields;
         }
 
         if($type == 'assignedTo')
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 819c19660d..baf6b38a65 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -80,6 +80,16 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
+$lang->programplan->ganttCustom['PM']           ='Manager';
+$lang->programplan->ganttCustom['deadline']     ='Deadline';
+$lang->programplan->ganttCustom['status']       ='Status';
+$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
+$lang->programplan->ganttCustom['realEnd']      ='Actual End';
+$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
+$lang->programplan->ganttCustom['estimate']     ='Estimate';
+$lang->programplan->ganttCustom['consumed']     ='Consumed';
+
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"Workload %" must be digits.';
 $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index aac1c8c430..b8671eb7c9 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -80,6 +80,16 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
+$lang->programplan->ganttCustom['PM']           ='Manager';
+$lang->programplan->ganttCustom['deadline']     ='Deadline';
+$lang->programplan->ganttCustom['status']       ='Status';
+$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
+$lang->programplan->ganttCustom['realEnd']      ='Actual End';
+$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
+$lang->programplan->ganttCustom['estimate']     ='Estimate';
+$lang->programplan->ganttCustom['consumed']     ='Consumed';
+
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"Workload %" must be digits.';
 $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 819c19660d..baf6b38a65 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -80,6 +80,16 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = 'Show Date';
 $lang->programplan->stageCustom->task = 'Show Task';
 
+$lang->programplan->ganttCustom['PM']           ='Manager';
+$lang->programplan->ganttCustom['deadline']     ='Deadline';
+$lang->programplan->ganttCustom['status']       ='Status';
+$lang->programplan->ganttCustom['realBegan']    ='Actual Began';
+$lang->programplan->ganttCustom['realEnd']      ='Actual End';
+$lang->programplan->ganttCustom['progress']     ='Workload Ratio';
+$lang->programplan->ganttCustom['taskProgress'] ='Task Progress';
+$lang->programplan->ganttCustom['estimate']     ='Estimate';
+$lang->programplan->ganttCustom['consumed']     ='Consumed';
+
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"Workload %" must be digits.';
 $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index b92b54e7dd..eed2d8f24b 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -80,6 +80,16 @@ $lang->programplan->stageCustom = new stdClass();
 $lang->programplan->stageCustom->date = '显示日期';
 $lang->programplan->stageCustom->task = '显示任务';
 
+$lang->programplan->ganttCustom['PM']           ='负责人';
+$lang->programplan->ganttCustom['deadline']     ='计划完成';
+$lang->programplan->ganttCustom['status']       ='状态';
+$lang->programplan->ganttCustom['realBegan']    ='实际开始';
+$lang->programplan->ganttCustom['realEnd']      ='实际结束';
+$lang->programplan->ganttCustom['progress']     ='工作量占比';
+$lang->programplan->ganttCustom['taskProgress'] ='任务进度';
+$lang->programplan->ganttCustom['estimate']     ='工时';
+$lang->programplan->ganttCustom['consumed']     ='消耗工时';
+
 $lang->programplan->error                  = new stdclass();
 $lang->programplan->error->percentNumber   = '"工作量比例"必须为数字';
 $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"';
diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index 982b4922d7..d1a4628e35 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -70,8 +70,13 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 <?php js::set('module', $app->rawModule);?>
 <?php js::set('method', $app->rawMethod);?>
 <?php js::set('ganttType', $ganttType);?>
+<?php js::set('showFields', $showFields);?>
 <?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
 <div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
+  <div class="pull-right btn-toolbar">
+    <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=programplan&section=ganttCustom&key=ganttFields')?>
+    <?php include '../../common/view/customfield.html.php';?>
+  </div>
   <form class="main-form form-ajax not-watch">
     <div class="example">
       <?php echo html::commonButton($lang->programplan->full, 'id="fullScreenBtn"', 'btn btn-primary btn-sm')?>
@@ -498,24 +503,23 @@ $(function()
     gantt.config.scale_height        = 18 * gantt.config.scales.length;
     gantt.config.duration_unit       = "day";
 
-    gantt.config.columns = [
-    {name: 'text',       width: '*', tree: true, resize: true, width:200},
-    {name: 'owner_id',   align: 'center', resize: true, width: 80, template: function(task){return getByIdForGantt(gantt.serverList('userList'), task.owner_id)}},
-    {name: 'status',     align: 'center', resize: true, width: 80},
-    {name: 'start_date', align: 'center', resize: true, width: 80},
-    {name: 'end_date',   align: 'center', resize: true, width: 80},
-    {name: 'duration',   align: 'center', resize: true, width: 60},
-    {name: 'estimate',   align: 'center', resize: true, width: 60},
-    {name: 'percent',    align: 'center', resize: true, width:70, template: function(plan)
-        {
-            if(plan.percent) return Math.round(plan.percent) + '%';
-        }
-    },
-    {name: 'taskProgress', align: 'center', resize: true, width: 60},
-    {name: 'realBegan',    align: 'center', resize: true, width: 60},
-    {name: 'realEnd',      align: 'center', resize: true, width: 60},
-    {name: 'consumed',     align: 'center', resize: false, width: 60},
-    ];
+    gantt.config.columns = [];
+    gantt.config.columns.push({name: 'text', width: '*', tree: true, resize: true, width:200});
+    if(showFields.indexOf('PM') != -1) gantt.config.columns.push({name: 'owner_id', align: 'center', resize: true, width: 80, template: function(task){return getByIdForGantt(gantt.serverList('userList'), task.owner_id)}})
+    if(showFields.indexOf('status') != -1) gantt.config.columns.push({name: 'status', align: 'center', resize: true, width: 80});
+    gantt.config.columns.push({name: 'start_date', align: 'center', resize: true, width: 80});
+    if(showFields.indexOf('deadline') != -1) gantt.config.columns.push({name: 'end_date', align: 'center', resize: true, width: 80});
+    gantt.config.columns.push({name: 'duration', align: 'center', resize: true, width: 60});
+    if(showFields.indexOf('estimate') != -1) gantt.config.columns.push({name: 'estimate', align: 'center', resize: true, width: 60});
+    if(showFields.indexOf('progress') != -1) gantt.config.columns.push({name: 'percent', align: 'center', resize: true, width:70, template: function(plan)
+                                                 {
+                                                     if(plan.percent) return Math.round(plan.percent) + '%';
+                                                 }
+                                             });
+    if(showFields.indexOf('taskProgress') != -1) gantt.config.columns.push({name: 'taskProgress', align: 'center', resize: true, width: 60});
+    if(showFields.indexOf('realBegan') != -1) gantt.config.columns.push({name: 'realBegan', align: 'center', resize: true, width: 60});
+    if(showFields.indexOf('realEnd') != -1) gantt.config.columns.push({name: 'realEnd', align: 'center', resize: true, width: 60});
+    if(showFields.indexOf('consumed') != -1) gantt.config.columns.push({name: 'consumed', align: 'center', resize: false, width: 60});
 
     gantt.locale.labels.column_text         = <?php echo json_encode($typeHtml);?>;
     gantt.locale.labels.column_owner_id     = "<?php echo $lang->programplan->PMAB;?>";
@@ -684,7 +688,7 @@ $(function()
         if(task) gantt[task.$open ? 'close' : 'open'](task.id);
     });
 
-    $(".checkbox-primary").on('click', function()
+    $(".example .checkbox-primary").on('click', function()
     {
         var stageCustom = [];
         $("input[name='stageCustom[]']:checked").each(function()

From 8f39557d0bb23c2a6e3f3c5e099257b0e2d85fa4 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 10 Aug 2022 14:37:17 +0800
Subject: [PATCH 14/14] * Optimize code.

---
 module/programplan/view/gantt.html.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index d1a4628e35..9b9cf6984d 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -511,11 +511,7 @@ $(function()
     if(showFields.indexOf('deadline') != -1) gantt.config.columns.push({name: 'end_date', align: 'center', resize: true, width: 80});
     gantt.config.columns.push({name: 'duration', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('estimate') != -1) gantt.config.columns.push({name: 'estimate', align: 'center', resize: true, width: 60});
-    if(showFields.indexOf('progress') != -1) gantt.config.columns.push({name: 'percent', align: 'center', resize: true, width:70, template: function(plan)
-                                                 {
-                                                     if(plan.percent) return Math.round(plan.percent) + '%';
-                                                 }
-                                             });
+    if(showFields.indexOf('progress') != -1) gantt.config.columns.push({name: 'percent', align: 'center', resize: true, width:70, template: function(plan){ if(plan.percent) return Math.round(plan.percent) + '%';}});
     if(showFields.indexOf('taskProgress') != -1) gantt.config.columns.push({name: 'taskProgress', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('realBegan') != -1) gantt.config.columns.push({name: 'realBegan', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('realEnd') != -1) gantt.config.columns.push({name: 'realEnd', align: 'center', resize: true, width: 60});