From 6ee6f5b99672c30d5112d01813a8b90a1ed0ab38 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 20 May 2022 05:59:51 +0000
Subject: [PATCH 01/34] * Finish task #54470.

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

diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 3999ad4d98..8b1571bf7f 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -108,4 +108,20 @@
     </div>
   </div>
 </div>
+<script>
+$('#repoForm').bind('DOMNodeInserted', function(e)
+{
+    if ( $("#clientLabel").length > 0 ) {
+        if($("#client").val() !== '')
+        {
+            $("#clientLabel").css('color','blue');
+            $("#client").attr('style', 'border-color: blue !important;');
+        }
+        else
+        {
+            $("#client").removeAttr("style");
+        }
+    }
+});
+</script>
 <?php include '../../common/view/footer.html.php'; ?>

From caaaa62cd2346ad6314614172d9dd4013f250f6d Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 20 May 2022 06:11:40 +0000
Subject: [PATCH 02/34] * Finish task #54470.

---
 module/repo/view/create.html.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 8b1571bf7f..fd80355b99 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -111,11 +111,12 @@
 <script>
 $('#repoForm').bind('DOMNodeInserted', function(e)
 {
-    if ( $("#clientLabel").length > 0 ) {
+    if ($("#clientLabel").length > 0)
+    {
         if($("#client").val() !== '')
         {
-            $("#clientLabel").css('color','blue');
-            $("#client").attr('style', 'border-color: blue !important;');
+            $("#clientLabel").css('color','#0c64eb');
+            $("#client").attr('style', 'border-color: #0c64eb !important;');
         }
         else
         {

From 1a137e058e6a73882f4bb74328e169fbd4a8344e Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 20 May 2022 06:12:29 +0000
Subject: [PATCH 03/34] * Finish task #54470.

---
 module/repo/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index fd80355b99..fe6d91913d 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -111,7 +111,7 @@
 <script>
 $('#repoForm').bind('DOMNodeInserted', function(e)
 {
-    if ($("#clientLabel").length > 0)
+    if($("#clientLabel").length > 0)
     {
         if($("#client").val() !== '')
         {

From 993138a2d1d1ec9288f71a98bf28a9b2f10536b3 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 20 May 2022 10:05:28 +0000
Subject: [PATCH 04/34] * Issue 645 resolved.

---
 module/testcase/css/showimport.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/testcase/css/showimport.css b/module/testcase/css/showimport.css
index e3294261dd..490d0b6ff0 100644
--- a/module/testcase/css/showimport.css
+++ b/module/testcase/css/showimport.css
@@ -1,4 +1,5 @@
 .table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
+.c-name {min-width: 120px;}
 .c-branch {width: 120px;}
 .c-line-number {width: 50px;}
 .c-id {width: 40px;}

From 20aa8a673e21a979c6ed5aba28b88ad396cadc30 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 20 May 2022 10:12:44 +0000
Subject: [PATCH 05/34] * Issue 657 resolved.

---
 module/common/model.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 97f1010422..e0cc0bf421 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -664,11 +664,7 @@ class commonModel extends model
                         $params = "productID=$productID&branch=&moduleID=0&from=&param=0&storyID=0&extras=from=global";
                         break;
                     case 'execution':
-                        $projectID = 0;
-                        if(in_array($app->tab, array('project', 'execution')) and isset($lang->switcherMenu))
-                        {
-                            $projectID = isset($_SESSION['project']) ? $_SESSION['project'] : 0;
-                        }
+                        $projectID = isset($_SESSION['project']) ? $_SESSION['project'] : 0;
                         $params = "projectID={$projectID}&executionID=0&copyExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global";
                         break;
                     case 'product':

From b75e26bfc5108ff599430a7c737568c46218aa40 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 24 May 2022 13:58:38 +0800
Subject: [PATCH 06/34] * Fix bug #22851.

---
 api/v1/entries/user.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index b0a5da7061..5c371e7ae3 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -192,7 +192,7 @@ class userEntry extends Entry
                     break;
                 case 'task':
                     $info->task = array('total' => 0, 'tasks' => array());
-                    if(!common::hasPriv('my', 'task')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     $control = $this->loadController('my', 'task');
                     $control->task($this->param('type', 'assignedTo'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
@@ -207,7 +207,7 @@ class userEntry extends Entry
                     break;
                 case 'bug':
                     $info->bug = array('total' => 0, 'bugs' => array());
-                    if(!common::hasPriv('my', 'bug')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     $control = $this->loadController('my', 'bug');
                     $control->bug($this->param('type', 'assignedTo'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
@@ -263,7 +263,7 @@ class userEntry extends Entry
                     break;
                 case 'story':
                     $info->story = array('total' => 0, 'stories' => array());
-                    if(!common::hasPriv('my', 'story')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     $control = $this->loadController('my', 'story');
                     $control->story($this->param('type', 'assignedTo'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
@@ -285,7 +285,7 @@ class userEntry extends Entry
                     break;
                 case 'issue':
                     $info->issue = array('total' => 0, 'issues' => array());
-                    if(!common::hasPriv('my', 'issue')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     if($this->config->edition == 'max')
                     {
@@ -302,7 +302,7 @@ class userEntry extends Entry
                     break;
                 case 'risk':
                     $info->risk = array('total' => 0, 'risks' => array());
-                    if(!common::hasPriv('my', 'risk')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     if($this->config->edition == 'max')
                     {
@@ -319,7 +319,7 @@ class userEntry extends Entry
                     break;
                 case 'meeting':
                     $info->meeting = array('total' => 0, 'meetings' => array());
-                    if(!common::hasPriv('my', 'myMeeting')) break;
+                    if(!common::hasPriv('my', 'work')) break;
 
                     if($this->config->edition == 'max')
                     {

From 5b623fa3c409f48501d2aa6c1600d5999883b62c Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 25 May 2022 01:12:37 +0000
Subject: [PATCH 07/34] * Finish task#55174

---
 module/task/js/create.js         | 2 +-
 module/task/view/create.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/js/create.js b/module/task/js/create.js
index 1511c7354d..c91c18c14d 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -490,7 +490,7 @@ $(document).ready(function()
     });
 });
 
-$(document).on('click', '#testStory_chosen,#story_chosen', function()
+$(document).on('click', '#testStory_chosen', function()
 {
     var $obj  = $(this).prev('select');
     var value = $obj.val();
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 52b2033e03..63faa82135 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -98,7 +98,7 @@
           <td colspan='3'>
             <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
             <div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
-              <?php echo html::select('story', array($task->story => (empty($stories) or !isset($stories[$task->story])) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
+              <?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
               <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
             </div>
           </td>

From 02d3db0b44a701a0b33427ae3e951bdd2a3f486d Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 25 May 2022 01:23:51 +0000
Subject: [PATCH 08/34] * Finish task #54998.

---
 module/bug/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index bbaa636ad9..33c4542722 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -66,7 +66,8 @@ class bug extends control
         }
         else
         {
-            $products = $this->product->getPairs('', 0, 'program_asc');
+            $mode     = (empty($this->config->CRProduct)) ? 'noclosed' : '';
+            $products = $this->product->getPairs($mode, 0, 'program_asc');
         }
         $this->view->products = $this->products = $products;
     }

From 33730f3787d3ac1fee779c43b2ac58809efe1d89 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 25 May 2022 01:56:04 +0000
Subject: [PATCH 09/34] * Fix bug #22880.

---
 module/project/model.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index d2fee3866f..86027b4422 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2482,15 +2482,6 @@ class projectModel extends model
         global $lang;
         $project = $this->getByID($objectID);
 
-        if(isset($project->model) and $project->model == 'waterfall')
-        {
-            global $lang;
-            $this->loadModel('execution');
-            $lang->executionCommon = $lang->project->stage;
-
-            include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
-        }
-
         $model = 'scrum';
         if($project) $model = $project->model;
 
@@ -2507,6 +2498,15 @@ class projectModel extends model
         $this->loadModel('common')->resetProjectPriv($objectID);
         if(!$this->common->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
 
+        if(isset($project->model) and $project->model == 'waterfall')
+        {
+            global $lang;
+            $this->loadModel('execution');
+            $lang->executionCommon = $lang->project->stage;
+
+            include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
+        }
+
         $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
 
         $this->saveState($objectID, $this->getPairsByProgram());

From 623cc446f9973c50ea77cca9aa5991a5fb23b2be Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 25 May 2022 02:28:08 +0000
Subject: [PATCH 10/34] * Fix bug #22881.

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

diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index c3f27fc413..f3f06a59e8 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -277,13 +277,13 @@
                   common::printIcon('programplan', 'edit', "stageID=$child->id&projectID=$projectID", $child, 'list', '', '', 'iframe', true);
 
                   $disabled = !empty($child->children) ? ' disabled' : '';
-                  if(common::hasPriv('execution', 'close', $child) and $execution->status != 'closed')
+                  if(common::hasPriv('execution', 'close', $child) and $child->status != 'closed')
                   {
                       common::printIcon('execution', 'close', "stageID=$child->id", $child, 'list', 'off', '' , $disabled . ' iframe', true, '', $this->lang->programplan->close);
                   }
-                  elseif(common::hasPriv('execution', 'activate', $child) and $execution->status == 'closed')
+                  elseif(common::hasPriv('execution', 'activate', $child) and $child->status == 'closed')
                   {
-                      common::printIcon('execution', 'activate', "stageID=$child->id", $child, 'list', 'magic', 'hiddenwin' , $disabled . ' iframe', true, '', $this->lang->programplan->activate);
+                      common::printIcon('execution', 'activate', "stageID=$child->id", $child, 'list', 'magic', '' , $disabled . ' iframe', true, '', $this->lang->programplan->activate);
                   }
 
                   if(common::hasPriv('execution', 'delete', $child))

From 5ea15374ac47fea3f1c65283aebccdee265a7984 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 25 May 2022 10:51:01 +0800
Subject: [PATCH 11/34] * Finish task #54994.

---
 module/bug/config.php                          | 1 +
 module/testreport/view/blockbugreport.html.php | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index c51a97e7f8..3ed3977fb8 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -340,6 +340,7 @@ $config->bug->datatable->fieldList['actions']['width']    = '150';
 $config->bug->datatable->fieldList['actions']['required'] = 'yes';
 
 $config->bug->colorList = new stdclass();
+$config->bug->colorList->pri[0]      = '#c0c0c0';
 $config->bug->colorList->pri[1]      = '#d50000';
 $config->bug->colorList->pri[2]      = '#ff9800';
 $config->bug->colorList->pri[3]      = '#2098ee';
diff --git a/module/testreport/view/blockbugreport.html.php b/module/testreport/view/blockbugreport.html.php
index d584d25b5a..a5ec05a050 100644
--- a/module/testreport/view/blockbugreport.html.php
+++ b/module/testreport/view/blockbugreport.html.php
@@ -83,7 +83,7 @@
                 </thead>
                 <?php foreach($lang->bug->priList as $key => $value):?>
                 <tr class='text-center'>
-                <td class='chart-color c-icon'><i class="chart-color-dot pri-<?php echo $key;?>"></i> <?php echo $key == 0 ? $lang->null : $value;?></td>
+                  <td class='chart-color c-icon'><i class="chart-color-dot pri-<?php echo $key;?>"></i> <?php echo $key == 0 ? $lang->null : $value;?></td>
                   <td class='chart-value'><?php echo $infoValue[$key]['generated'];?></td>
                   <td class='chart-value'><?php echo $infoValue[$key]['legacy'];?></td>
                   <td class='chart-value'><?php echo $infoValue[$key]['resolved'];?></td>
@@ -202,6 +202,7 @@
 <?php js::set('bugStageGroups', $bugInfo['bugStageGroups']);?>
 <?php js::set('bugHandleGroups', $bugInfo['bugHandleGroups']);?>
 <?php js::set('dateGroups', !empty($bugInfo['bugHandleGroups']) ? array_keys($bugInfo['bugHandleGroups']['generated']) : '');?>
+<?php js::set('priColorList', $config->bug->colorList->pri);?>
 <script>
 var priList   = [];
 var stageList = [];
@@ -209,16 +210,16 @@ var colorList = ['#d5d9df', '#d50000', '#ff9800', '#2098ee', '#009688'];
 var colorKey  = 0;
 for(var key in bugPriList)
 {
-    $('.pri-' + key).css('background', colorList[colorKey]);
+    var currentColor = colorKey <= 7 ? priColorList[colorKey] : '#C0C0C0';
+    $('.pri-' + key).css('background', currentColor);
     var priName = key == 0 ? zeroPri : bugPriList[key];
     var pri = {
         label: priName,
-        color: colorList[colorKey],
+        color: currentColor,
         data:  [bugStageGroups[key]['generated'], bugStageGroups[key]['legacy'], bugStageGroups[key]['resolved']]
     }
     priList.push(pri);
     colorKey++;
-    if(colorKey >= 5) colorKey -= 5;
 }
 var data = {
     labels: bugStageValueList,

From 33a23e09c54314b7a4d71a7003afdcddcccd6f87 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 25 May 2022 02:51:17 +0000
Subject: [PATCH 12/34] * Finish task#55172

---
 module/my/control.php           |  9 +++++++--
 module/my/view/project.html.php | 17 +++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 3850eda41f..42e999364f 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -695,10 +695,11 @@ EOF;
      * @param  int     $recTotal
      * @param  int     $recPerPage
      * @param  int     $pageID
+     * @param  string  $orderBy
      * @access public
      * @return void
      */
-    public function project($status = 'doing', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    public function project($status = 'doing', $recTotal = 0, $recPerPage = 15, $pageID = 1, $orderBy = 'id_desc')
     {
         $this->loadModel('program');
         $this->app->loadLang('project');
@@ -713,7 +714,7 @@ EOF;
 
         /* Get PM id list. */
         $accounts = array();
-        $projects = $this->user->getObjects($this->app->user->account, 'project', $status, 'id_desc', $pager);
+        $projects = $this->user->getObjects($this->app->user->account, 'project', $status, $orderBy, $pager);
         foreach($projects as $project)
         {
             if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM;
@@ -727,6 +728,10 @@ EOF;
         $this->view->PMList     = $PMList;
         $this->view->pager      = $pager;
         $this->view->status     = $status;
+        $this->view->recTotal   = $recTotal;
+        $this->view->recPerPage = $recPerPage;
+        $this->view->pageID     = $pageID;
+        $this->view->orderBy    = $orderBy;
         $this->display();
     }
 
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 918f2b33e5..5b57199850 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -30,18 +30,19 @@
   </div>
   <?php else:?>
   <form class='main-table' id='projectForm' method='post' data-ride='table' data-checkable='false'>
-    <table class='table table-fixed' id='projectList'>
+    <table class='table has-sort-head table-fixed' id='projectList'>
+      <?php $vars = "status=$status&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&orderBy=%s"; ?>
       <thead>
         <tr>
-          <th class='c-id'><?php echo $lang->idAB;?></th>
-          <th><?php echo $lang->project->name;?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+          <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
           <?php if($status == 'openedbyme'):?>
-          <th class='c-status'> <?php echo $lang->project->status;?></th>
+          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>
           <?php endif;?>
-          <th class='c-date'><?php echo $lang->project->begin;?></th>
-          <th class='c-date'><?php echo $lang->project->end;?></th>
-          <th class='text-right c-budget'><?php echo $lang->project->budget;?></th>
-          <th class='c-user'><?php echo $lang->project->PM;?></th>
+          <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->project->begin);?></th>
+          <th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
+          <th class='text-right c-budget'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
+          <th class='c-user'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
           <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
         </tr>
       </thead>

From 532ed847f386222632b892f7fdfd6f00e45ca295 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 25 May 2022 03:07:59 +0000
Subject: [PATCH 13/34] fixbug_sunjun

---
 module/bug/js/common.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 6d7d53a597..daae2a1246 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -807,6 +807,7 @@ function setBranchRelated(branchID, productID, num)
         });
     }
 }
+
 $(document).ready(function()
 {
     $('#customField').click(function()
@@ -823,6 +824,4 @@ $(document).ready(function()
     {
         $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled');
     });
-
-
 });

From c4d2cfe200a41fd585a96af033ebe86d9a3bbc0e Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 25 May 2022 03:19:07 +0000
Subject: [PATCH 14/34] fixbug_sunjun_sprint194

---
 module/group/lang/resource.php            |  2 ++
 module/kanban/view/activatespace.html.php | 40 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 module/kanban/view/activatespace.html.php

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index faec27e9e2..dfc318bd1b 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -620,6 +620,7 @@ $lang->resource->kanban->createSpace        = 'createSpace';
 $lang->resource->kanban->editSpace          = 'editSpace';
 $lang->resource->kanban->closeSpace         = 'closeSpace';
 $lang->resource->kanban->deleteSpace        = 'deleteSpace';
+$lang->resource->kanban->activateSpace      = 'activateSpace';
 $lang->resource->kanban->sortSpace          = 'sortSpace';
 $lang->resource->kanban->create             = 'create';
 $lang->resource->kanban->edit               = 'edit';
@@ -714,6 +715,7 @@ $lang->kanban->methodOrder[225] = 'batchCreateCard';
 $lang->kanban->methodorder[230] = 'import';
 $lang->kanban->methodorder[235] = 'enableArchived';
 $lang->kanban->methodorder[240] = 'activate';
+$lang->kanban->methodorder[245] = 'activateSpace';
 
 /* Execution. */
 $lang->resource->execution = new stdclass();
diff --git a/module/kanban/view/activatespace.html.php b/module/kanban/view/activatespace.html.php
new file mode 100644
index 0000000000..ee96b52254
--- /dev/null
+++ b/module/kanban/view/activatespace.html.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * The closespace file of kanban module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Shujie Tian <tianshujie@easycorp.ltd>
+ * @package     kanban
+ * @version     $Id: activatespace.html.php 935 2021-12-15 11:22:24Z $
+ * @link        https://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $space->id;?></span>
+        <?php echo "<span title='$space->name'>" . $space->name . '</span>';?>
+      </h2>
+    </div>
+    <form method='post' enctype='multipart/form-data' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='c-comment'><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='text-center form-actions'>
+            <?php echo html::submitButton($lang->kanban->activateSpace);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
+  </div>
+</div>
+<?php include '../../common/view/footer.html.php';?>

From 47151034b05b9a5359c469c69fb4d50e95b18b6d Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 25 May 2022 11:21:49 +0800
Subject: [PATCH 15/34] * Finish task #54996.

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

diff --git a/module/bug/js/report.js b/module/bug/js/report.js
index 4b60e932d5..cd26d766af 100644
--- a/module/bug/js/report.js
+++ b/module/bug/js/report.js
@@ -5,7 +5,7 @@ $(function()
         $('.table-wrapper').each(function()
         {
             var $this = $(this);
-            $this.css('max-height', $this.closest('.table').find('.chart-wrapper').outerHeight());
+            $this.css('max-height', $this.closest('.table-row.chart-row').find('.chart-wrapper').outerHeight());
         });
     };
     resizeChartTable();

From 4a3a1dee336fc9b73f325d0d28a7491583e95b70 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 25 May 2022 05:06:22 +0000
Subject: [PATCH 16/34] fixbug_sunjun_sprint194

---
 module/kanban/view/space.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 0e3cce5d4a..c98e90e271 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -55,7 +55,7 @@
           <?php if($class == 'disabled'):?>
           <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>
           <?php else:?>
-          <?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-close"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
+          <?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
           <?php endif;?>
           <?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->delete, 'hiddenwin', '', '', true);?>
         </div>

From 2219a42fa29cd62a9572ec2fa2c17757063016d1 Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Wed, 25 May 2022 05:09:51 +0000
Subject: [PATCH 17/34] fixbug_sunjun_194

---
 module/kanban/control.php | 2 +-
 module/kanban/model.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 22175ef1ce..782af7f301 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -117,7 +117,7 @@ class kanban extends control
     /**
      * Activate a space.
      *
-     * @param int     $spaceID
+     * @param  int    $spaceID
      * @access public
      * @return array
      */
diff --git a/module/kanban/model.php b/module/kanban/model.php
index d7f8d0cfda..ffd966d6d9 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1863,7 +1863,7 @@ class kanbanModel extends model
     /**
      * Activate a space.
      *
-     * @param int     $spaceID
+     * @param  int    $spaceID
      * @access public
      * @return array
      */

From 12b17116694032253da8e57e3ae9bd00dc9c2892 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 25 May 2022 13:14:43 +0800
Subject: [PATCH 18/34] * Add language item of kanban.

---
 module/kanban/lang/en.php    | 4 ++++
 module/kanban/lang/zh-cn.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 8783e9b086..dfb75bbda0 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -99,6 +99,8 @@ $lang->kanban->closedDate     = 'Closed Date';
 $lang->kanban->empty          = 'No Kanban';
 $lang->kanban->teamSumCount   = '%s people in total';
 $lang->kanban->cardCount      = 'Card Count';
+$lang->kanban->activatedBy    = 'Activated By';
+$lang->kanban->activatedDate  = 'Activated Date';
 
 $lang->kanban->createColumnOnLeft  = 'Create Column On Left';
 $lang->kanban->createColumnOnRight = 'Create Column On Right';
@@ -264,6 +266,8 @@ $lang->kanbanspace->lastEditedDate = 'Edited Date';
 $lang->kanbanspace->closedBy       = 'Closed By';
 $lang->kanbanspace->closedDate     = 'Closed Date';
 $lang->kanbanspace->type           = 'Type';
+$lang->kanbanspace->activatedBy    = 'Activated By';
+$lang->kanbanspace->activatedDate  = 'Activated Date';
 
 $lang->kanbanspace->empty = 'No Space';
 
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index d2382dd1ad..97709efc8c 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -99,6 +99,8 @@ $lang->kanban->closedDate     = '关闭日期';
 $lang->kanban->empty          = '暂时没有看板';
 $lang->kanban->teamSumCount   = '共%s人';
 $lang->kanban->cardCount      = '卡片数量';
+$lang->kanban->activatedBy    = '由谁激活';
+$lang->kanban->activatedDate  = '激活日期';
 
 $lang->kanban->createColumnOnLeft  = '在左侧添加看板列';
 $lang->kanban->createColumnOnRight = '在右侧添加看板列';
@@ -264,6 +266,8 @@ $lang->kanbanspace->lastEditedDate = '最后修改日期';
 $lang->kanbanspace->closedBy       = '由谁关闭';
 $lang->kanbanspace->closedDate     = '关闭日期';
 $lang->kanbanspace->type           = '空间类型';
+$lang->kanbanspace->activatedBy    = '由谁激活';
+$lang->kanbanspace->activatedDate  = '激活日期';
 
 $lang->kanbanspace->empty = '暂时没有空间';
 

From 6c97c848443b115003f71014882ee9bd1dff9b5c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 25 May 2022 13:21:50 +0800
Subject: [PATCH 19/34] * Fix bug #22562.

---
 module/story/model.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index c5eb84255b..81c32d912e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -437,9 +437,12 @@ class storyModel extends model
     public function batchCreate($productID = 0, $branch = 0, $type = 'story')
     {
         $forceReview = $this->checkForceReview();
+
+        $reviewers = '';
         foreach($_POST['title'] as $index => $value)
         {
-            if($_POST['title'][$index] and isset($_POST['reviewer'][$index])) $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
+            if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and empty($_POST['reviewDitto'][$index])) $reviewers = $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
+            if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and !empty($_POST['reviewDitto'][$index])) $_POST['reviewer'][$index] = $reviewers;
             if($_POST['title'][$index] and empty($_POST['reviewer'][$index]) and $forceReview)
             {
                 dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
@@ -478,15 +481,11 @@ class storyModel extends model
 
         $extendFields = $this->getFlowExtendFields();
         $data         = array();
-        $reviewers    = '';
         foreach($stories->title as $i => $title)
         {
             if(empty($title)) continue;
 
             if(empty($stories->reviewer[$i]) and empty($stories->reviewerDitto[$i])) $stories->reviewer[$i] = array();
-            $reviewers = (isset($stories->reviewDitto[$i])) ? $reviewers : $stories->reviewer[$i];
-            $_POST['reviewer'][$i] = $reviewers;
-            $stories->reviewer[$i] = $reviewers;
 
             $story = new stdclass();
             $story->type       = $type;

From 33b78769b487e4e7ac88451dcbc5f5924684bd2a Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 25 May 2022 05:28:36 +0000
Subject: [PATCH 20/34] * Fix bug #22901.

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

diff --git a/module/task/model.php b/module/task/model.php
index 3947b52a85..6db40fe8ac 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1966,6 +1966,7 @@ class taskModel extends model
         {
             $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->fetchAll('id');
             unset($task->assignedTo);
+            unset($task->id);
             $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec();
             $this->dao->update(TABLE_TASK)->set('assignedTo=openedBy')->where('parent')->eq((int)$taskID)->exec();
             if(!dao::isError() and count($oldChildrenTasks) > 0)
@@ -2051,6 +2052,7 @@ class taskModel extends model
         {
             $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->fetchAll('id');
             unset($task->left);
+            unset($task->id);
             $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec();
             $this->computeWorkingHours($taskID);
             if(!dao::isError() and count($oldChildrenTasks) > 0)

From 80c73a6f83475116af91652fae9dfe4ebc6954d9 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 25 May 2022 13:30:30 +0800
Subject: [PATCH 21/34] * Finish task #54990.

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

diff --git a/module/product/model.php b/module/product/model.php
index 138a3bb85f..a1a24e5c97 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -270,7 +270,7 @@ class productModel extends model
             ->orWhere('t1.createdBy')->eq($this->app->user->account)
             ->markRight(1)
             ->fi()
-            ->orderBy('t1.order_asc')
+            ->orderBy('t1.program_asc,t1.order_asc')
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->fetchAll('id');
     }

From 52fc5e45ec6e7d80a668cdcf914a1c18c6248581 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 25 May 2022 13:40:38 +0800
Subject: [PATCH 22/34] * Fix bug #22665.

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

diff --git a/module/kanban/model.php b/module/kanban/model.php
index ffd966d6d9..6ab2b71c5c 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3703,7 +3703,6 @@ class kanbanModel extends model
                 $count = $this->dao->select('COUNT(id) AS count')->from(TABLE_KANBANLANE)
                     ->where('deleted')->eq('0')
                     ->andWhere('region')->eq($object->region)
-                    ->beginIF($action == 'deletelane')->andWhere('type')->eq($object->type)->fi()
                     ->beginIF($action == 'sortlane')->andWhere('`group`')->eq($object->group)->fi()
                     ->fetch('count');
                 return $count > 1;

From e3d1c44eaec766c2c7cc4d4adacefa62e4adc0e6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 25 May 2022 13:45:10 +0800
Subject: [PATCH 23/34] * Finish task #55257.

---
 db/update17.0.beta1.sql                  |  3 +
 db/zentao.sql                            |  1 +
 module/task/control.php                  |  4 +-
 module/task/js/create.js                 |  7 ++-
 module/task/js/edit.js                   | 72 +++++++++++++++++++++---
 module/task/lang/de.php                  |  5 ++
 module/task/lang/en.php                  |  5 ++
 module/task/lang/fr.php                  |  5 ++
 module/task/lang/zh-cn.php               |  5 ++
 module/task/model.php                    | 12 +++-
 module/task/view/assignto.html.php       |  6 +-
 module/task/view/batchedit.html.php      |  2 +-
 module/task/view/create.html.php         |  4 ++
 module/task/view/edit.html.php           | 10 +++-
 module/task/view/finish.html.php         |  6 +-
 module/task/view/pause.html.php          |  6 +-
 module/task/view/recordestimate.html.php |  6 +-
 module/task/view/start.html.php          |  6 +-
 module/task/view/view.html.php           |  6 ++
 19 files changed, 153 insertions(+), 18 deletions(-)

diff --git a/db/update17.0.beta1.sql b/db/update17.0.beta1.sql
index a916d02ba7..7f67f4c88c 100644
--- a/db/update17.0.beta1.sql
+++ b/db/update17.0.beta1.sql
@@ -3,3 +3,6 @@ ALTER TABLE `zt_kanbanspace` ADD COLUMN `activatedDate` datetime NOT NULL AFTER
 
 ALTER TABLE `zt_kanban` ADD COLUMN `activatedBy` char(30) NOT NULL AFTER `closedDate`;
 ALTER TABLE `zt_kanban` ADD COLUMN `activatedDate` datetime NOT NULL AFTER `activatedBy`;
+
+ALTER TABLE `zt_task` ADD COLUMN `mode` varchar(10) NOT NULL AFTER `type`;
+UPDATE `zt_task` SET mode = 'linear' WHERE `id` IN (SELECT root FROM `zt_team` WHERE type = 'task');
diff --git a/db/zentao.sql b/db/zentao.sql
index 0ec6975287..618c17016a 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1463,6 +1463,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `fromBug` mediumint(8) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL,
   `type` varchar(20) NOT NULL,
+  `mode` varchar(10) NOT NULL,
   `pri` tinyint(3) unsigned NOT NULL default '0',
   `estimate` float unsigned NOT NULL,
   `consumed` float unsigned NOT NULL,
diff --git a/module/task/control.php b/module/task/control.php
index 6a8a17aa23..5dc5243ab3 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -824,7 +824,7 @@ class task extends control
             $this->loadModel('action');
             foreach($tasks as $taskID => $task)
             {
-                if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account) continue;
+                if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account and $task->mode == 'linear') continue;
                 if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
 
                 $changes = $this->task->assign($taskID);
@@ -1207,7 +1207,7 @@ class task extends control
         }
 
         $task         = $this->view->task;
-        $members      = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
+        $members      = $task->team ? $this->task->getMemberPairs($task) : $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $task->nextBy = $task->openedBy;
 
         $this->view->users = $members;
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 1511c7354d..a942920439 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -23,6 +23,7 @@ function loadExecutionMembers(executionID)
 {
     $("#multipleBox").removeAttr("checked");
     $('.team-group').addClass('hidden');
+    $(".modeBox").addClass("hidden");
     $.get(createLink('execution', 'ajaxGetMembers', 'executionID=' + executionID + '&assignedTo=' + $('#assignedTo').val()), function(data)
     {
         $('#assignedTo_chosen').remove();
@@ -141,6 +142,7 @@ function setOwners(result)
 {
     $("#multipleBox").removeAttr("checked");
     $('.team-group').addClass('hidden');
+    $('.modeBox').addClass('hidden');
     $('#assignedTo, #assignedTo_chosen').removeClass('hidden');
     $('#assignedTo').next('.picker').removeClass('hidden');
     if(result == 'affair')
@@ -150,6 +152,7 @@ function setOwners(result)
         $('#assignedTo').chosen();
         $('.affair').hide();
         $('.team-group').addClass('hidden');
+        $('.modeBox').addClass('hidden');
         $('#selectAllUser').removeClass('hidden');
     }
     else if($('#assignedTo').attr('multiple') == 'multiple')
@@ -421,7 +424,7 @@ $(document).ready(function()
 
     $(window).resize();
 
-    /* show team menu. */
+    /* Show team menu. */
     $('[name^=multiple]').change(function()
     {
         if($(this).prop('checked'))
@@ -429,6 +432,7 @@ $(document).ready(function()
             $('#assignedTo, #assignedTo_chosen').addClass('hidden');
             $('#assignedTo').next('.picker').addClass('hidden');
             $('.team-group').removeClass('hidden');
+            $('.modeBox').removeClass('hidden');
             $('#estimate').attr('readonly', true);
         }
         else
@@ -436,6 +440,7 @@ $(document).ready(function()
             $('#assignedTo, #assignedTo_chosen').removeClass('hidden');
             $('#assignedTo').next('.picker').removeClass('hidden');
             $('.team-group').addClass('hidden');
+            $('.modeBox').addClass('hidden');
             $('#estimate').attr('readonly', false);
         }
         $('#dataPlanGroup').fixInputGroup();
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index 0a49d29468..9e2a46d744 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -82,17 +82,29 @@ $(document).ready(function()
         if(checked)
         {
             $('#teamTr').removeClass('hidden');
+            $('.modeBox').removeClass('hidden');
+            $('#mode').removeAttr('disabled').trigger('chosen:updated');
             $('#parent').val('');
             $('#parent').trigger('chosen:updated');
             $('#parent').closest('tr').addClass('hidden');
             $('#estimate').attr('disabled', 'disabled');
+            $('#left').attr('disabled', 'disabled');
+
+            var mode = $('#mode').val();
+            if((mode == 'linear' && currentUser != oldAssignedTo) || !team[currentUser]) $('[name=assignedTo]').attr('disabled', 'disabled').trigger('chosen:updated');
         }
         else
         {
             $('#teamTr').addClass('hidden');
+            $('.modeBox').addClass('hidden');
+            $('#mode').attr('disabled', 'disabled').trigger('chosen:updated');
             $('#parent').closest('tr').removeClass('hidden');
             $('#estimate').removeAttr('disabled');
+            $('#left').removeAttr('disabled');
+            $('[name=assignedTo]').removeAttr('disabled').trigger('chosen:updated');
         }
+
+        updateAssignedTo();
     });
 
     /* Init task team manage dialog */
@@ -156,11 +168,11 @@ $('#confirmButton').click(function()
             if(i <= j) return;
             if(value == $(this).val()) $(this).closest('tr').addClass('hidden');
         })
-    })
+    });
+
     $('select[name^=team]').closest('tr.hidden').remove();
 
     var memberCount   = '';
-    var assignedTo    = '';
     var totalEstimate = 0;
     var totalConsumed = oldConsumed;
     var totalLeft     = 0;
@@ -168,9 +180,6 @@ $('#confirmButton').click(function()
     {
         if($(this).find('option:selected').text() == '') return;
 
-        var account  = $(this).find('option:selected').val();
-        var realName = $(this).find('option:selected').text();
-        assignedTo += "<option value='" + account + "' title='" + realName + "'>" + realName + "</option>";
         memberCount++;
 
         estimate = parseFloat($(this).parents('td').next('td').find('[name^=teamEstimate]').val());
@@ -185,8 +194,7 @@ $('#confirmButton').click(function()
     $('#estimate').val(totalEstimate);
     $('#consumedSpan').html(totalConsumed);
     $('#left').val(totalLeft);
-    $('#assignedTo').html(assignedTo);
-    $('#assignedTo').trigger('chosen:updated');
+    updateAssignedTo();
 
     if(memberCount < 2)
     {
@@ -200,3 +208,53 @@ $('#confirmButton').click(function()
     }
     $('.close').click();
 });
+
+/**
+ * Update assignedTo.
+ *
+ * @access public
+ * @return void
+ */
+function updateAssignedTo()
+{
+    var html       = '';
+    var multiple   = $('#multiple').prop('checked');
+    var assignedTo = $('#assignedTo').val();
+    if(multiple)
+    {
+        var isTeamMember = false;
+        var mode         = $('#mode').val();
+        $('select[name^=team]').each(function()
+        {
+            if($(this).find('option:selected').text() == '') return;
+            if($(this).val() == currentUser) isTeamMember = true;
+
+            var account  = $(this).find('option:selected').val();
+            var realName = $(this).find('option:selected').text();
+            var selected = account == assignedTo ? 'selected' : '';
+
+            html += "<option value='" + account + "' title='" + realName + "'" + selected + ">" + realName + "</option>";
+
+        });
+
+        if(mode == 'multi' && isTeamMember)
+        {
+            $('[name=assignedTo]').removeAttr('disabled').trigger('chosen:updated');
+        }
+        else
+        {
+            if(currentUser != oldAssignedTo || !isTeamMember) $('[name=assignedTo]').attr('disabled', 'disabled').trigger('chosen:updated');
+        }
+    }
+    else
+    {
+        for(key in members)
+        {
+            var selected = key == assignedTo ? 'selected' : '';
+            html += "<option value='" + key + "' title='" + members[key] + "'" + selected + ">" + members[key] + "</option>";
+        }
+    }
+
+    $('#assignedTo').html(html);
+    $('#assignedTo').trigger('chosen:updated');
+}
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 6ba9d23cb6..b48f5fcfe2 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -68,6 +68,7 @@ $lang->task->color             = 'Color';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Typ';
 $lang->task->typeAB            = 'Typ';
+$lang->task->mode              = 'Mode';
 $lang->task->pri               = 'Priorität';
 $lang->task->mailto            = 'Mail an';
 $lang->task->estimate          = 'Geplant(h)';
@@ -131,6 +132,7 @@ $lang->task->parentAB          = 'Hauptaufgabe';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Story Tested';
+$lang->task->teamMember        = 'Team Member';
 
 $lang->task->ditto             = 'Dito';
 $lang->task->dittoNotice       = "Diese Aufgabe gehört nicht zum %s wie die Vorherige!";
@@ -172,6 +174,9 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Erledigt';
 $lang->task->reasonList['cancel'] = 'Abgebrochen';
 
+$lang->task->modeList['linear'] = 'Serial';
+$lang->task->modeList['multi']  = 'Parallel';
+
 $lang->task->afterChoices['continueAdding'] = ' Weitere Aufgaben erfassen';
 $lang->task->afterChoices['toTaskList']     = 'Zurück zur Aufgabenliste';
 $lang->task->afterChoices['toStoryList']    = 'Zurück zur Storyliste';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index fd136094ec..355f5d22f3 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -72,6 +72,7 @@ $lang->task->color             = 'Color';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
 $lang->task->typeAB            = 'Type';
+$lang->task->mode              = 'Mode';
 $lang->task->sync2Gitlab       = 'Sync to GitLab';
 $lang->task->pri               = 'Priority';
 $lang->task->mailto            = 'Mailto';
@@ -149,6 +150,7 @@ $lang->task->parentAB          = 'Parent';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Story Tested';
+$lang->task->teamMember        = 'Team Member';
 
 /* Fields of zt_taskestimate. */
 $lang->task->task    = 'Task';
@@ -198,6 +200,9 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Done';
 $lang->task->reasonList['cancel'] = 'Cancelled';
 
+$lang->task->modeList['linear'] = 'Serial';
+$lang->task->modeList['multi']  = 'Parallel';
+
 $lang->task->afterChoices['continueAdding'] = ' Continue Adding Tasks';
 $lang->task->afterChoices['toTaskList']     = 'Go to Task List';
 $lang->task->afterChoices['toStoryList']    = 'Go to Story List';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 9e5cfbf417..acf50cea8a 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -68,6 +68,7 @@ $lang->task->color             = 'Couleur';
 $lang->task->name              = 'Nom';
 $lang->task->type              = 'Type';
 $lang->task->typeAB            = 'Type';
+$lang->task->mode              = 'Mode';
 $lang->task->pri               = 'Priorité';
 $lang->task->mailto            = 'Mailto';
 $lang->task->estimate          = 'Estimés';
@@ -131,6 +132,7 @@ $lang->task->parentAB          = 'Parent';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = 'Story Testée';
+$lang->task->teamMember        = 'Team Member';
 
 $lang->task->ditto             = 'Idem';
 $lang->task->dittoNotice       = "Cette Tâche n'est pas associée au %s comme la précédente peut l'être !";
@@ -172,6 +174,9 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = 'Fait';
 $lang->task->reasonList['cancel'] = 'Annulé';
 
+$lang->task->modeList['linear'] = 'Serial';
+$lang->task->modeList['multi']  = 'Parallel';
+
 $lang->task->afterChoices['continueAdding'] = ' Continuer Ajouter Tâches';
 $lang->task->afterChoices['toTaskList']     = 'Aller à la liste des Tâches';
 $lang->task->afterChoices['toStoryList']    = 'Aller à la liste des Stories';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index a2470ff572..89eacc29a7 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -72,6 +72,7 @@ $lang->task->color             = '标题颜色';
 $lang->task->name              = '任务名称';
 $lang->task->type              = '任务类型';
 $lang->task->typeAB            = '类型';
+$lang->task->mode              = '任务模式';
 $lang->task->sync2Gitlab       = '同步到GitLab';
 $lang->task->pri               = '优先级';
 $lang->task->mailto            = '抄送给';
@@ -149,6 +150,7 @@ $lang->task->parentAB          = '父';
 $lang->task->lblPri            = 'P';
 $lang->task->lblHour           = '(h)';
 $lang->task->lblTestStory      = "测试{$lang->SRCommon}";
+$lang->task->teamMember        = '团队成员';
 
 /* Fields of zt_taskestimate. */
 $lang->task->task    = '任务';
@@ -198,6 +200,9 @@ $lang->task->reasonList['']       = '';
 $lang->task->reasonList['done']   = '已完成';
 $lang->task->reasonList['cancel'] = '已取消';
 
+$lang->task->modeList['linear'] = '串行';
+$lang->task->modeList['multi']  = '并行';
+
 $lang->task->afterChoices['continueAdding'] = "继续为该{$lang->SRCommon}添加任务";
 $lang->task->afterChoices['toTaskList']     = '返回任务列表';
 $lang->task->afterChoices['toStoryList']    = "返回{$lang->SRCommon}列表";
diff --git a/module/task/model.php b/module/task/model.php
index 3947b52a85..f31ee8a612 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -895,6 +895,12 @@ class taskModel extends model
             return false;
         }
 
+        /* If a multiple task is assigned to a team member who is not the task, assign to the team member instead. */
+        if(!$this->post->assignedTo and !empty($_POST['team']) and !in_array($oldTask->assignedTo, $this->post->team))
+        {
+            $_POST['assignedTo'] = reset($_POST['team']);
+        }
+
         /* When the selected parent task is a common task and has consumption, select other parent tasks. */
         if($this->post->parent > 0)
         {
@@ -942,7 +948,7 @@ class taskModel extends model
 
             ->setIF($oldTask->name != $this->post->name || $oldTask->estStarted != $this->post->estStarted || $oldTask->deadline != $this->post->deadline, 'version', $oldTask->version + 1)
 
-            ->setDefault('lastEditedBy',   $this->app->user->account)
+            ->setDefault('lastEditedBy', $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
             ->cleanINT('execution,story,module')
@@ -1007,6 +1013,10 @@ class taskModel extends model
                 $task->assignedTo = key($teams);
             }
         }
+        else
+        {
+            $task->mode = '';
+        }
 
         $executionType  = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($task->execution)->fetch('type');
         $requiredFields = "," . $this->config->task->edit->requiredFields . ",";
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index a30a8e5426..b58b8e8e65 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -14,11 +14,15 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
-    <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
+    <?php if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
     <div class="alert with-icon">
       <i class="icon-exclamation-sign"></i>
       <div class="content">
+        <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
         <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->transfer);?></p>
+        <?php else:?>
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->transfer);?></p>
+        <?php endif;?>
       </div>
     </div>
     <?php else:?>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 4e8550cc2f..348188b2f3 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -87,7 +87,7 @@ js::set('dittoNotice', $dittoNotice);
           }
           ?>
           <tr>
-            <?php $disableAssignedTo = (isset($teams[$taskID]) and $tasks[$taskID]->assignedTo != $this->app->user->account) ? "disabled='disabled'" : '';?>
+            <?php $disableAssignedTo = (isset($teams[$taskID]) and (($tasks[$taskID]->assignedTo != $this->app->user->account and $tasks[$taskID]->mode == 'linear') or !isset($teams[$taskID][$app->user->account]))) ? "disabled='disabled'" : '';?>
             <?php $disableHour = (isset($teams[$taskID]) or $tasks[$taskID]->parent < 0) ? "disabled='disabled'" : '';?>
             <?php
             $members      = array('' => '', 'ditto' => $this->lang->task->ditto);
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 52b2033e03..28375fcf32 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -77,6 +77,10 @@
             <button id='selectAllUser' type="button" class="btn btn-link<?php if($task->type !== 'affair') echo ' hidden';?>"><?php echo $lang->task->selectAllUser;?></button>
           </td>
         </tr>
+        <tr class='hidden modeBox'>
+          <th><?php echo $lang->task->mode;?></th>
+          <td><?php echo html::select('mode', $lang->task->modeList, '', "class='form-control chosen'");?></td>
+        </tr>
         <?php if($execution->type == 'kanban'):?>
         <tr>
           <th><?php echo $lang->kanbancard->region;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 7ccf449406..f2366880e7 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -19,6 +19,9 @@
 <?php js::set('oldExecutionID', $task->execution);?>
 <?php js::set('oldConsumed', $task->consumed);?>
 <?php js::set('taskStatus', $task->status);?>
+<?php js::set('currentUser', $app->user->account);?>
+<?php js::set('team', $task->team);?>
+<?php js::set('members', $members);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
@@ -127,7 +130,7 @@
               <?php endif;?>
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>
-                <?php $disableAssignedTo = (!empty($task->team) and $task->assignedTo != $this->app->user->account) ? "disabled='disabled'" :'';?>
+                <?php $disableAssignedTo = (!empty($task->team) and (($task->assignedTo != $this->app->user->account and $task->mode == 'linear') or !isset($task->team[$app->user->account]))) ? "disabled='disabled'" :'';?>
                 <?php
                 $taskMembers = array();
                 if(!empty($task->team))
@@ -146,6 +149,11 @@
                 ?>
                 <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $taskMembers, $task->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></span></td>
               </tr>
+              <tr class="modeBox <?php echo $task->mode ? '' : 'hidden';?>">
+                <th><?php echo $lang->task->mode;?></th>
+                <?php $disabledMode = isset($task->team[$app->user->account]) ? '' : "disabled='disabled'"?>
+                <td><?php echo html::select('mode', $lang->task->modeList, $task->mode, "class='form-control chosen' $disabledMode onchange='updateAssignedTo()'");?></td>
+              </tr>
               <tr class='<?php echo empty($task->team) ? 'hidden' : ''?>' id='teamTr'>
                 <th><?php echo $lang->task->team;?></th>
                 <td><?php echo html::a('#modalTeam', $lang->task->team, '', "class='form-control btn' data-toggle='modal'");?></td>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 2c9b16a134..47791f0368 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -15,11 +15,15 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
-    <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
+    <?php if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
     <div class="alert with-icon">
       <i class="icon-exclamation-sign"></i>
       <div class="content">
+        <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
         <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->finish);?></p>
+        <?php else:?>
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->finish);?></p>
+        <?php endif;?>
       </div>
     </div>
     <?php else:?>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index e580f43c86..5e221cee4e 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -14,11 +14,15 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
-    <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
+    <?php if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
     <div class="alert with-icon">
       <i class="icon-exclamation-sign"></i>
       <div class="content">
+        <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
         <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->pause);?></p>
+        <?php else:?>
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->pause);?></p>
+        <?php endif;?>
       </div>
     </div>
     <?php else:?>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 0c782791c5..4153a61e18 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -71,14 +71,18 @@
           <?php endif;?>
           <?php endforeach;?>
           <?php endif;?>
-      <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
+      <?php if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):?>
         </tbody>
       </table>
     </form>
     <div class="alert with-icon">
       <i class="icon-exclamation-sign"></i>
       <div class="content">
+        <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
         <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
+        <?php else:?>
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->logEfforts);?></p>
+        <?php endif;?>
       </div>
     </div>
     <?php else:?>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 741c5e4bb2..6221cc92d8 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -18,12 +18,16 @@
 <div id='mainContent' class='main-content'>
   <?php
   /* IF it is multi-task, the suspened can only be restarted by the current user who it is assigned to. */
-  if(!empty($task->team) && $task->assignedTo != $this->app->user->account):
+  if(!empty($task->team) and (!isset($task->team[$app->user->account]) or ($task->assignedTo != $app->user->account and $task->mode == 'linear'))):
   ?>
   <div class="alert with-icon">
     <i class="icon-exclamation-sign"></i>
     <div class="content">
+      <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
       <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->start);?></p>
+      <?php else:?>
+      <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->start);?></p>
+      <?php endif;?>
     </div>
   </div>
   <?php else:?>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index ec607004ca..a701242662 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -268,6 +268,12 @@
                   <th><?php echo $lang->task->assignedTo;?></th>
                   <td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->noData;?></td>
                 </tr>
+                <?php if($task->mode):?>
+                <tr>
+                  <th><?php echo $lang->task->mode;?></th>
+                  <td><?php echo zget($lang->task->modeList, $task->mode);?></td>
+                </tr>
+                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->task->type;?></th>
                   <td><?php echo $lang->task->typeList[$task->type];?></td>

From 9e3133e2a38a04380488c103d55e73679b0e3de3 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 25 May 2022 13:49:25 +0800
Subject: [PATCH 24/34] * Resolve issue #644.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index ee586c068b..9466ae2de2 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2218,7 +2218,7 @@ class bugModel extends model
     {
         $datas = $this->dao->select('severity AS name, COUNT(*) AS value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
         if(!$datas) return array();
-        foreach($datas as $severity => $data) if(isset($this->lang->bug->severityList[$severity])) $data->name = $this->lang->bug->severityList[$severity];
+        foreach($datas as $severity => $data) if(isset($this->lang->bug->severityList[$severity])) $data->name = $this->lang->bug->report->bugsPerSeverity->graph->xAxisName . ':' . $this->lang->bug->severityList[$severity];
         return $datas;
     }
 

From 7d5b4616bb13c3c8c2573d08a5b4ee53cde391f0 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 25 May 2022 05:53:27 +0000
Subject: [PATCH 25/34] * Finish task #54991.

---
 module/execution/view/tips.html.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/tips.html.php b/module/execution/view/tips.html.php
index 85379d575a..23c9dee70a 100644
--- a/module/execution/view/tips.html.php
+++ b/module/execution/view/tips.html.php
@@ -5,6 +5,14 @@
     <?php if($execution->lifetime != 'ops') echo html::a($this->createLink('execution', 'linkstory', "executionID=$executionID"), $lang->execution->linkStory, '', "class='btn' data-app='execution'");?>
     <?php echo html::a($this->createLink('task', 'create', "execution=$executionID"), $lang->execution->createTask, '', "class='btn' data-app='execution'");?>
     <?php echo html::a($this->createLink('execution', 'task', "executionID=$executionID"), $lang->execution->goback, '', "class='btn' data-app='execution'");?>
-    <?php echo html::a($this->createLink('project', 'execution', "status=all&projectID=$projectID"), $lang->execution->gobackExecution, '', "class='btn' data-app='project'");?>
+    <?php echo html::a('javascript:void(0)', $lang->execution->gobackExecution, '', "class='btn' onclick='closeTipModal($projectID)' data-app='project'");?>
   </div>
 </div>
+<script>
+function closeTipModal(projectID)
+{
+    $(".close").trigger("click");
+    var link = createLink('project', 'execution', 'status=all&projectID=' + projectID);
+    $.apps.open(link, 'project');
+}
+</script>

From 8e3068d9b5c746f89c75232c72b7b79ae78da0fb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 25 May 2022 14:26:21 +0800
Subject: [PATCH 26/34] * Finish task #55257.

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

diff --git a/module/task/model.php b/module/task/model.php
index f31ee8a612..0f93821f2d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -133,6 +133,7 @@ class taskModel extends model
 
             /* Fix Bug #2466 */
             if($this->post->multiple) $task->assignedTo = '';
+            if(!$this->post->multiple or count(array_filter($this->post->team)) < 1) $task->mode = '';
             $this->dao->insert(TABLE_TASK)->data($task, $skip = 'gitlab,gitlabProject')
                 ->autoCheck()
                 ->batchCheck($requiredFields, 'notempty')

From ececdba8df23df540fc3cfb9f783b4fdbbf6c39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 25 May 2022 14:46:59 +0800
Subject: [PATCH 27/34] * Fix bug #55323.

---
 module/custom/js/set.js         | 2 +-
 module/custom/view/set.html.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/custom/js/set.js b/module/custom/js/set.js
index 244532a04d..e6540cd08e 100644
--- a/module/custom/js/set.js
+++ b/module/custom/js/set.js
@@ -36,7 +36,7 @@ $('[name*=unitList]').change(function()
 
 $('#submit').click(function()
 {
-    if(module == 'testcase' && field == 'review' && stopSubmit)
+    if(module == 'testcase' && field == 'review' && stopSubmit && oldNeedReview)
     {
         var needReview = $('input:radio[name="needReview"]:checked').val();
         stopSubmit     = false;
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 4e1a38ed76..2d4fc3c8c4 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -128,6 +128,7 @@ EOT;
         </tr>
         <?php endif;?>
         <?php if($module == 'testcase'):?>
+        <?php js::set('oldNeedReview', $needReview);?>
         <tr <?php if($needReview) echo "class='hidden'"?>>
           <th><?php echo $lang->custom->forceReview;?></th>
           <td><?php echo html::select('forceReview[]', $users, $forceReview, "class='form-control chosen' multiple");?></td>

From 049c774680ef17c53139d5ccbecf5061d8146e81 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 25 May 2022 07:12:30 +0000
Subject: [PATCH 28/34] * Finish task #54983.

---
 module/repo/js/create.js         | 16 ++++++++++++++++
 module/repo/view/create.html.php | 17 -----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/module/repo/js/create.js b/module/repo/js/create.js
index c515bbd787..e07724a48d 100644
--- a/module/repo/js/create.js
+++ b/module/repo/js/create.js
@@ -7,6 +7,22 @@ $(function()
         $form.css('min-height', $form.height());
     })
 
+    $('#repoForm').bind('DOMNodeInserted', function(e)
+    {
+        if($("#clientLabel").length > 0)
+        {
+            if($("#client").val() !== '' && $("#client").val().indexOf(" ") == -1)
+            {
+                $("#clientLabel").css('color','#0c64eb');
+                $("#client").attr('style', 'border-color: #0c64eb !important; box-shadow: 0 0 6px #0c64eb !important;');
+            }
+            else
+            {
+                $("#client").removeAttr("style");
+            }
+        }
+    });
+
     $('#gitlabHost').change(function()
     {
         host  = $('#gitlabHost').val();
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index fe6d91913d..3999ad4d98 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -108,21 +108,4 @@
     </div>
   </div>
 </div>
-<script>
-$('#repoForm').bind('DOMNodeInserted', function(e)
-{
-    if($("#clientLabel").length > 0)
-    {
-        if($("#client").val() !== '')
-        {
-            $("#clientLabel").css('color','#0c64eb');
-            $("#client").attr('style', 'border-color: #0c64eb !important;');
-        }
-        else
-        {
-            $("#client").removeAttr("style");
-        }
-    }
-});
-</script>
 <?php include '../../common/view/footer.html.php'; ?>

From 673c192017703ea25db6073d89e0f572cc702ebe Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 25 May 2022 15:41:27 +0800
Subject: [PATCH 29/34] * Fix bug #22664.

---
 module/design/control.php        | 5 ++++-
 module/design/model.php          | 2 +-
 module/design/view/view.html.php | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/design/control.php b/module/design/control.php
index f7525c16ab..d7c7a47295 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -220,9 +220,12 @@ class design extends control
      */
     public function view($designID = 0)
     {
-        $design = $this->design->getByID($designID);
+        $design    = $this->design->getByID($designID);
         $productID = $this->commonAction($design->project, $design->product, $designID);
 
+        $this->session->set('revisionList', $this->app->getURI(true));
+        $this->session->set('storyList', $this->app->getURI(true), 'product');
+
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->view;
         $this->view->position[] = $this->lang->design->view;
 
diff --git a/module/design/model.php b/module/design/model.php
index 1eec165770..4a83455ffb 100644
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -249,7 +249,7 @@ class designModel extends model
 
         $design->commit = '';
         $relations = $this->loadModel('common')->getRelations('design', $designID, 'commit');
-        foreach($relations as $relation) $design->commit .= html::a(helper::createLink('design', 'revision', "repoID=$relation->BID&projectID={$design->project}"), "#$relation->BID", '', "class=iframe");
+        foreach($relations as $relation) $design->commit .= html::a(helper::createLink('design', 'revision', "repoID=$relation->BID&projectID={$design->project}"), "#$relation->BID");
 
         return $this->loadModel('file')->replaceImgURL($design, 'desc');
     }
diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php
index a00c782294..1f8ded1892 100644
--- a/module/design/view/view.html.php
+++ b/module/design/view/view.html.php
@@ -71,7 +71,7 @@
             </tr>
             <tr>
               <th><?php echo $lang->design->story;?></th>
-              <td><?php echo $design->story ? html::a($this->createLink('story', 'view', "id=$design->story", '', true), zget($stories, $design->story), '',"class=iframe") : '';?></td>
+              <td><?php echo $design->story ? html::a($this->createLink('story', 'view', "id=$design->story"), zget($stories, $design->story)) : '';?></td>
             </tr>
             <tr>
               <th><?php echo $lang->design->submission;?></th>

From 0a84e5fb8103693efdb880f4db81052d7d8be2ae Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 25 May 2022 15:51:48 +0800
Subject: [PATCH 30/34] * fix bug #54940

---
 module/bug/view/edit.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 5b6a8e5805..885c717c4f 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -137,7 +137,11 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->status;?></th>
-                  <td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
+                  <td><?php
+                            echo zget($lang->bug->statusList, $bug->status);
+                            echo html::hidden('status', $bug->status);
+                      ?>
+                 </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->confirmed;?></th>

From fcf8218569a4f693d2c7ef83a1187115b1089ac7 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 25 May 2022 07:57:57 +0000
Subject: [PATCH 31/34] * Finish task #54470.

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

diff --git a/module/repo/js/create.js b/module/repo/js/create.js
index e07724a48d..fc45001f45 100644
--- a/module/repo/js/create.js
+++ b/module/repo/js/create.js
@@ -13,8 +13,8 @@ $(function()
         {
             if($("#client").val() !== '' && $("#client").val().indexOf(" ") == -1)
             {
-                $("#clientLabel").css('color','#0c64eb');
-                $("#client").attr('style', 'border-color: #0c64eb !important; box-shadow: 0 0 6px #0c64eb !important;');
+                $("#clientLabel").css('color', '#0c64eb');
+                $("#client").attr('style', 'border-color: #0c64eb !important;box-shadow: 0 0 6px #0c64eb !important;');
             }
             else
             {

From 36010b797f702d5bf1c43afedaac9a795aa0ad8a Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 25 May 2022 15:58:26 +0800
Subject: [PATCH 32/34] * fix bug #54940

---
 module/bug/view/edit.html.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 885c717c4f..3981eb1f15 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -137,10 +137,11 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->status;?></th>
-                  <td><?php
-                            echo zget($lang->bug->statusList, $bug->status);
-                            echo html::hidden('status', $bug->status);
-                      ?>
+                  <td>
+                    <?php
+                    echo zget($lang->bug->statusList, $bug->status);
+                    echo html::hidden('status', $bug->status);
+                    ?>
                  </td>
                 </tr>
                 <tr>

From b1ac09ae5377078cd68d28ecfe421b3dd4f68406 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 25 May 2022 08:01:10 +0000
Subject: [PATCH 33/34] * Finish task #54991.

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

diff --git a/module/execution/view/tips.html.php b/module/execution/view/tips.html.php
index 23c9dee70a..ef11d46ded 100644
--- a/module/execution/view/tips.html.php
+++ b/module/execution/view/tips.html.php
@@ -9,6 +9,13 @@
   </div>
 </div>
 <script>
+/**
+ * Click the return to iteration list button to close tipModal.
+ *
+ * @param  int $projectID
+ * @access public
+ * @return void
+ */
 function closeTipModal(projectID)
 {
     $(".close").trigger("click");

From 5fad83c3326558873bef7d0ffe111bad903751aa Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 25 May 2022 16:32:31 +0800
Subject: [PATCH 34/34] * Fix bug #22920.

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

diff --git a/module/common/model.php b/module/common/model.php
index 27e2443cc6..d9971a399e 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2300,7 +2300,7 @@ EOD;
 
             if(isset($this->app->user))
             {
-                if(in_array($module, $this->config->programPriv->waterfall) and $this->app->tab == 'project') return true;
+                if(in_array($module, $this->config->programPriv->waterfall) and $this->app->tab == 'project' and $method != 'browse') return true;
 
                 $this->app->user = $this->session->user;
                 if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method);