From e1dd273c3c3776080f41137f90a885cfc2645a33 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 08:49:13 +0800
Subject: [PATCH 01/35] * Modify the add contact popup style.

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

diff --git a/module/my/view/buildcontactlists.html.php b/module/my/view/buildcontactlists.html.php
index 4500d2b2bd..1a210b3245 100644
--- a/module/my/view/buildcontactlists.html.php
+++ b/module/my/view/buildcontactlists.html.php
@@ -17,8 +17,9 @@ if($contactLists)
 }
 else
 {
+    $width = isonlybody() ? 'data-width=100%' : '';
     echo '<span class="input-group-btn">';
-    echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe'><i class='icon icon-cog'></i></a>";
+    echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe' $width><i class='icon icon-cog'></i></a>";
     echo '</span>';
     echo '<span class="input-group-btn">';
     echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon"' . "onclick=\"ajaxGetContacts(this, '$dropdownName')\"" . '><i class="icon icon-refresh"></i></button>';

From 06701aa5a0856b1fcebed5d51d322a0e45f43913 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 09:34:52 +0800
Subject: [PATCH 02/35] * Fix style issues when raising bugs.

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

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index c33c1a9f2a..ca57e65f41 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -124,7 +124,9 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               <div class='input-group' id='buildBox'>
                 <span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
                 <?php echo html::select('openedBuild[]', $builds, empty($buildID) ? '' : $buildID, "multiple=multiple class='chosen form-control'");?>
+                <?php if(count($builds) < 2):?>
                 <span class='input-group-addon fix-border' id='buildBoxActions'></span>
+                <?php endif;?>
                 <div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' id='all' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
               </div>
             </td>

From 2d3c8464d3d0e44e4dea3154b30481784c877115 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:20:46 +0800
Subject: [PATCH 03/35] * Fix bug #20458,20369,20140,20373.

---
 extension/lite/block/ext/lang/en/lite.php                   | 2 ++
 extension/lite/block/ext/lang/zh-cn/lite.php                | 2 ++
 extension/lite/common/ext/lang/en/lite.php                  | 1 +
 extension/lite/common/ext/lang/zh-cn/lite.php               | 1 +
 extension/lite/todo/ext/view/batchcreate.lite.html.hook.php | 2 --
 module/todo/js/batchcreate.js                               | 1 +
 module/todo/view/batchcreate.html.php                       | 3 +++
 module/user/control.php                                     | 2 --
 8 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/extension/lite/block/ext/lang/en/lite.php b/extension/lite/block/ext/lang/en/lite.php
index fbefe01a6d..2b2566c658 100644
--- a/extension/lite/block/ext/lang/en/lite.php
+++ b/extension/lite/block/ext/lang/en/lite.php
@@ -19,7 +19,9 @@ $lang->block->story = 'Target';
 
 $lang->block->storyCount = 'Target Count';
 
+/* unset contribute and projectteam. */
 unset($lang->block->default['full']['my']['9']);
+unset($lang->block->default['full']['my']['6']);
 
 $lang->block->default['full']['my']['5']['title']  = 'Kanban List';
 $lang->block->default['full']['my']['5']['block']  = 'scrumlist';
diff --git a/extension/lite/block/ext/lang/zh-cn/lite.php b/extension/lite/block/ext/lang/zh-cn/lite.php
index 9bd80e60a2..4c60831543 100644
--- a/extension/lite/block/ext/lang/zh-cn/lite.php
+++ b/extension/lite/block/ext/lang/zh-cn/lite.php
@@ -19,7 +19,9 @@ $lang->block->story = '目标';
 
 $lang->block->storyCount = '目标数';
 
+/* unset contribute and projectteam. */
 unset($lang->block->default['full']['my']['9']);
+unset($lang->block->default['full']['my']['6']);
 
 $lang->block->default['full']['my']['5']['title']  = '看板列表';
 $lang->block->default['full']['my']['5']['block']  = 'scrumlist';
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index feec557208..d010fef107 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -68,6 +68,7 @@ $lang->my->menuOrder[5]  = 'index';
 $lang->my->menuOrder[10] = 'calendar';
 if($config->edition != 'open') $lang->my->menuOrder[11] = 'effort';
 $lang->my->menuOrder[20] = 'task';
+$lang->my->menuOrder[25] = 'contacts';
 
 $lang->my->dividerMenu = ',calendar,';
 
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 9012c1b61f..f6f3feccfd 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -68,6 +68,7 @@ $lang->my->menuOrder[5]  = 'index';
 $lang->my->menuOrder[10] = 'calendar';
 if($config->edition != 'open') $lang->my->menuOrder[11] = 'effort';
 $lang->my->menuOrder[20] = 'task';
+$lang->my->menuOrder[25] = 'contacts';
 
 $lang->my->dividerMenu = ',calendar,';
 
diff --git a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
index f9ced5a133..93373fe779 100644
--- a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
+++ b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
@@ -1,8 +1,6 @@
-<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 <script>
 $(function()
 {
     for(var index = 0; index <= 9; index++) $('#todoBatchAddForm').append(`<input type="hidden" name="vision[${index}]" id="vision[${index}]" value="lite">`);
-    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
 });
 </script>
diff --git a/module/todo/js/batchcreate.js b/module/todo/js/batchcreate.js
index 31c002d1b4..04aef4a837 100644
--- a/module/todo/js/batchcreate.js
+++ b/module/todo/js/batchcreate.js
@@ -25,4 +25,5 @@ $(function()
         $('#todoBatchAddForm #switchDate').val(value);
     });
     $('.main-header #date').change();
+    parent.$('#triggerModal .modal-content .modal-header .close').hide();
 });
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 75442634be..359b2effc7 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -96,8 +96,11 @@
     </table>
   </form>
 </div>
+<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 
 <script>
+$('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
+
 var $form = $('#todoBatchAddForm').on('change', '.control-time-switch', function()
 {
     var $checkbox = $(this);
diff --git a/module/user/control.php b/module/user/control.php
index 896b0ae31f..d1e884cd53 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -526,7 +526,6 @@ class user extends control
 
         $groups = $this->dao->select('id, name, role')
             ->from(TABLE_GROUP)
-            ->where('vision')->eq($this->config->vision)
             ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();
@@ -561,7 +560,6 @@ class user extends control
     {
         $groups = $this->dao->select('id, name, role')
             ->from(TABLE_GROUP)
-            ->where('vision')->eq($this->config->vision)
             ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();

From 234a2352ec36d26912689b1517e54ded209a47d0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:37:10 +0800
Subject: [PATCH 04/35] * Fix bug #20487.

---
 module/bug/control.php  | 8 +++++---
 module/bug/js/common.js | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 76f9ee2e47..77185c8bad 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2236,15 +2236,17 @@ class bug extends control
      * Ajax get project team members.
      *
      * @param  int    $projectID
+     * @param  string $$selectedUser
      * @access public
-     * @return void
+     * @return string
      */
-    public function ajaxGetProjectTeamMembers($projectID)
+    public function ajaxGetProjectTeamMembers($projectID, $selectedUser = '')
     {
         $users       = $this->loadModel('user')->getPairs('noclosed');
         $teamMembers = empty($projectID) ? array() : $this->loadModel('project')->getTeamMemberPairs($projectID);
         foreach($teamMembers as $account => $member) $teamMembers[$account] = $users[$account];
-        return print(html::select('assignedTo', $teamMembers, '', 'class="form-control"'));
+
+        return print(html::select('assignedTo', $teamMembers, $selectedUser, 'class="form-control"'));
     }
 
 
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 9b4b38b923..069794e9d5 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -32,7 +32,7 @@ function loadAll(productID)
     if(page == 'create')
     {
         loadExecutionTeamMembers(productID);
-        setAssignedTo();
+        setTimeout("setAssignedTo()", 50);
     }
 
     if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed)
@@ -485,7 +485,7 @@ function loadExecutionBuilds(executionID)
  */
 function loadProjectTeamMembers(projectID)
 {
-    link = createLink('bug', 'ajaxGetProjectTeamMembers', 'projectID=' + projectID);
+    link = createLink('bug', 'ajaxGetProjectTeamMembers', 'projectID=' + projectID + '&selectedUser=' + $('#assignedTo').val());
     $.get(link, function(data)
     {
         if(!data) data = '<select id="assignedTo" name="assignedTo" class="form-control"></select>';

From d6692b22c10189d447df0197bfb6e54944647f20 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:39:45 +0800
Subject: [PATCH 05/35] * Fix bug #20522.

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

diff --git a/module/my/control.php b/module/my/control.php
index 95d130dc23..92be67f2b1 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -499,7 +499,7 @@ EOF;
         $this->view->position[]  = $this->lang->my->bug;
         $this->view->bugs        = $bugs;
         $this->view->users       = $this->user->getPairs('noletter');
-        $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted');
+        $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted|noclosed');
         $this->view->tabID       = 'bug';
         $this->view->type        = $type;
         $this->view->recTotal    = $recTotal;

From 57da5c00a93a6f8ac19bf96a9898b36e9a31aed8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:47:16 +0800
Subject: [PATCH 06/35] * Fix bug #20503.

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

diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 10f90a4e11..069f8d94bb 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -148,7 +148,7 @@ foreach(explode(',', $showFields) as $field)
         <tr>
           <td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center form-actions'>
             <?php echo html::submitButton();?>
-            <?php echo $this->app->tab == 'product' ? html::a($this->session->storyList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
+            <?php echo ($this->app->tab == 'product' or $this->app->tab == 'execution') ? html::a($this->session->storyList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
           </td>
         </tr>
       </tfoot>

From 07f2f81d434d11501764da06426cd88813f06b6c Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:55:55 +0800
Subject: [PATCH 07/35] * Fix bug #20432.

---
 module/dept/model.php | 3 +--
 module/user/model.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/dept/model.php b/module/dept/model.php
index c258bab7f8..965c77337e 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -409,8 +409,7 @@ class deptModel extends model
             ->where('deleted')->eq(0)
             ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
             ->beginIF($childDepts)->andWhere('dept')->in($childDepts)->fi()
-            ->beginIF($this->config->vision == 'lite')->andWhere('visions')->eq('lite')->fi()
-            ->beginIF($this->config->vision != 'lite')->andWhere('visions')->ne('lite')->fi()
+            ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
             ->orderBy('account')
             ->fetchPairs();
     }
diff --git a/module/user/model.php b/module/user/model.php
index 799503b8b0..51f5eecf38 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -282,8 +282,7 @@ class userModel extends model
             ->beginIF($query)->andWhere($query)->fi()
             ->beginIF($browseType == 'inside')->andWhere('type')->eq('inside')->fi()
             ->beginIF($browseType == 'outside')->andWhere('type')->eq('outside')->fi()
-            ->beginIF($this->config->vision == 'lite')->andWhere('visions')->eq('lite')->fi()
-            ->beginIF($this->config->vision != 'lite')->andWhere('visions')->ne('lite')->fi()
+            ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();

From e4dba8b07330aa83498bc33d16052bc272351f97 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 12:40:28 +0800
Subject: [PATCH 08/35] * Modify the code writing logic.

---
 module/bug/js/common.js | 6 +-----
 module/bug/js/create.js | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 069794e9d5..39a5065509 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -29,11 +29,7 @@ $(function()
  */
 function loadAll(productID)
 {
-    if(page == 'create')
-    {
-        loadExecutionTeamMembers(productID);
-        setTimeout("setAssignedTo()", 50);
-    }
+    if(page == 'create') loadExecutionTeamMembers(productID, true);
 
     if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed)
     {
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 710b877545..247e64e139 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -25,10 +25,11 @@ function loadAllUsers()
   * Load team members of the latest execution of a product as assignedTo list.
   *
   * @param  int    $productID
+  * @param  bool   $changeProduct
   * @access public
   * @return void
   */
-function loadExecutionTeamMembers(productID)
+function loadExecutionTeamMembers(productID, changeProduct)
 {
     var link = createLink('bug', 'ajaxLoadExecutionTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val());
     $.post(link, function(data)
@@ -36,6 +37,7 @@ function loadExecutionTeamMembers(productID)
         $('#assignedTo').replaceWith(data);
         $('#assignedTo_chosen').remove();
         $('#assignedTo').chosen();
+        if(typeof(changeProduct) != undefined && changeProduct)setAssignedTo();
     })
 }
 

From e7670ff411ecb44675c65f6602e3aa0a2de741f7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 13:22:43 +0800
Subject: [PATCH 09/35] * Add spaces.

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

diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index 247e64e139..1b381ac281 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -37,7 +37,7 @@ function loadExecutionTeamMembers(productID, changeProduct)
         $('#assignedTo').replaceWith(data);
         $('#assignedTo_chosen').remove();
         $('#assignedTo').chosen();
-        if(typeof(changeProduct) != undefined && changeProduct)setAssignedTo();
+        if(typeof(changeProduct) != undefined && changeProduct) setAssignedTo();
     })
 }
 

From b876d3d981afeea6d136f66ecc21952fd1b81a60 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 9 Mar 2022 13:36:43 +0800
Subject: [PATCH 10/35] * Adjust the makefile.

---
 Makefile                 | 4 +---
 tools/mergezentaopms.php | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0a0bb955f5..db8f5517c0 100644
--- a/Makefile
+++ b/Makefile
@@ -242,12 +242,10 @@ ci:
 
 	make package
 	zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
-	#make deb; make rpm; make en
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
 	make en
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
 	php tools/mergezentaopms.php $(VERSION)
-	rm zentaobiz*.zip zentaomax*.zip
+	rm zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm
 	cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) 
-	rm -f $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm
 	mv *.zip *.deb *.rpm $(RELEASE_PATH)
diff --git a/tools/mergezentaopms.php b/tools/mergezentaopms.php
index 355d8c6346..f252c29ffa 100755
--- a/tools/mergezentaopms.php
+++ b/tools/mergezentaopms.php
@@ -34,6 +34,7 @@ foreach(array('zh-cn', 'en') as $langType)
 
     foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion)
     {
+        echo "zip $packPrefix.{$version}.php{$phpVersion}.zip\n";
         `unzip $packPrefix.{$version}.zip`;
         `unzip zentaobiz.php{$phpVersion}.zip`;
         `unzip zentaomax.php{$phpVersion}.zip`;
@@ -52,6 +53,7 @@ foreach(array('zh-cn', 'en') as $langType)
 //
 //    foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion)
 //    {
+//	    echo "dpkg {$packPrefix}_{$version}_{$phpVersion}_1_all.deb\n";
 //	    `mkdir buildroot`;
 //	    `cp -r build/debian/DEBIAN buildroot`;
 //	    `sed -i '/^Version/cVersion: $version' buildroot/DEBIAN/control`;
@@ -74,6 +76,7 @@ foreach(array('zh-cn', 'en') as $langType)
 //
 //    foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion)
 //    {
+//	    echo "rpmbuild {$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm\n";
 //	    `mkdir ~/rpmbuild/SPECS -p`;
 //	    `mkdir ~/rpmbuild/SOURCES`;
 //	    `mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p`;

From 6efc56ebd12a7e1ad779c78bccc89b02bf6757c2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 13:39:35 +0800
Subject: [PATCH 11/35] * Fix bug #20506.

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

diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 9cf64ae901..99a9876b90 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -221,7 +221,7 @@ $(function()
         },
         itemCreator: function($li, item)
         {
-            var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}&from=<?php echo $from;?>&projectID=<?php echo $projectID; ?>'.format(item.id, branch)) + '" data-app="' + tab + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
+            var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}&from=<?php echo $from;?>&projectID=<?php echo isset($projectID) ? $projectID : 0; ?>'.format(item.id, branch)) + '" data-app="' + tab + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
             var $toggle = $('<span class="module-name" data-id="' + item.id + '">' + link + '</span>');
             if(item.type === 'bug') $toggle.append('&nbsp; <span class="text-muted">[B]</span>');
             if(item.type === 'case') $toggle.append('&nbsp; <span class="text-muted">[C]</span>');

From b1623bb73a051d69aa294afa765aaad009a06834 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 9 Mar 2022 13:46:19 +0800
Subject: [PATCH 12/35] * Add auto test for task.

---
 module/task/model.php                   |   2 +-
 test/class/task.class.php               |  32 +++
 test/data/action.yaml                   |   2 +-
 test/data/moretask.yaml                 |   5 +-
 test/data/task.yaml                     |  26 +-
 test/data/taskson.yaml                  | 326 ++++++++++++++++++++++++
 test/data/zentao/config.php             |   2 +
 test/model/task/computeWorkingHours.php |  23 ++
 test/model/task/getProjectID.php        |   2 +-
 test/model/task/getStoryComments.php    |  21 ++
 10 files changed, 427 insertions(+), 14 deletions(-)
 create mode 100644 test/data/taskson.yaml
 create mode 100644 test/model/task/computeWorkingHours.php
 create mode 100644 test/model/task/getStoryComments.php

diff --git a/module/task/model.php b/module/task/model.php
index 7363bdd6e0..410c25aee5 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2171,7 +2171,7 @@ class taskModel extends model
                     $task->parentName = $parent->name;
                 }
             }
-        }        
+        }
 
         return $this->processTasks($tasks);
     }
diff --git a/test/class/task.class.php b/test/class/task.class.php
index d85a181b55..8373e17752 100644
--- a/test/class/task.class.php
+++ b/test/class/task.class.php
@@ -563,4 +563,36 @@ class taskTest
             return $object;
         }
     }
+
+    public function getStoryComments($storyID)
+    {
+        $object = $this->objectModel->getStoryComments($storyID);
+
+        unset($_POST);
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $object;
+        }
+    }
+
+    public function computeWorkingHoursTest($taskID)
+    {
+        $result = $this->objectModel->computeWorkingHours($taskID);
+
+        unset($_POST);
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            $object = $this->objectModel->getById($taskID);
+            if($object->parent) $parentObject = $this->objectModel->getById($object->parent);
+            return isset($parentObject) ? $parentObject : $object;
+        }
+    }
 }
diff --git a/test/data/action.yaml b/test/data/action.yaml
index 580cc8c24b..ee30e86443 100644
--- a/test/data/action.yaml
+++ b/test/data/action.yaml
@@ -55,7 +55,7 @@ fields:
     format: ""
   - field: comment
     note: "备注"
-    range: "1-100000"
+    range: 1-100000
     prefix: "这是一个系统日志测试备注"
     postfix: ""
     loop: 0
diff --git a/test/data/moretask.yaml b/test/data/moretask.yaml
index 9c382fee9c..19a589fe73 100644
--- a/test/data/moretask.yaml
+++ b/test/data/moretask.yaml
@@ -117,11 +117,12 @@ fields:
     format: ""
   - field: deadline
     note: "截止日期"
-    range: "2022-02-27"
+    range: "(-1w)-(-1M):-1D"
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    type: timestamp
+    format: "YY/MM/DD"
   - field: status
     note: "任务状态"
     range: wait,doing,done,pause,cancel,closed
diff --git a/test/data/task.yaml b/test/data/task.yaml
index 4eaf8dc707..d74d81ee78 100644
--- a/test/data/task.yaml
+++ b/test/data/task.yaml
@@ -117,11 +117,12 @@ fields:
     format: ""
   - field: deadline
     note: "截止日期"
-    range: "2022-02-27"
+    range: "(+1w)-(-1M):-1D"
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    type: timestamp
+    format: "YY/MM/DD"
   - field: status
     note: "任务状态"
     range: wait,doing,done,pause,cancel,closed
@@ -204,7 +205,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    type: timestamp
+    format: "YY/MM/DD"
   - field: realStarted
     note: "实际开始"
     from: common.date.v1.yaml
@@ -212,7 +214,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: finishedBy
     note: "由谁完成"
     from: common.user.v1.yaml
@@ -228,7 +231,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: finishedList
     note: "完成者列表"
     from: common.user.v1.yaml
@@ -252,7 +256,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: closedBy
     note: "由谁关闭"
     from: common.user.v1.yaml
@@ -268,7 +273,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: realDuration
     note: "实际持续时长"
     range: 1
@@ -305,7 +311,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: activatedDate
     note: "重新激活日期"
     from: common.date.v1.yaml
@@ -313,7 +320,8 @@ fields:
     prefix: ""
     postfix: ""
     loop: 0
-    format: ""
+    format: "YY/MM/DD"
+    type: timestamp
   - field: deleted
     note: "是否删除"
     range: 0
diff --git a/test/data/taskson.yaml b/test/data/taskson.yaml
new file mode 100644
index 0000000000..eab4b3786c
--- /dev/null
+++ b/test/data/taskson.yaml
@@ -0,0 +1,326 @@
+title: table zt_task
+desc: "任务"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    note: "id"
+    range: 901-910
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: parent
+    note: "父任务"
+    range: 601-603
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: project
+    note: "所属项目"
+    range: 11
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: execution
+    note: "所属执行"
+    range: 101
+  - field: module
+    note: "所属模块"
+    range: 21
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: story
+    note: "相关需求"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: design
+    note: "相关设计"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: storyVersion
+    note: "需求版本"
+    range: 1
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: designVersion
+    note: "设计版本"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: fromBug
+    note: "来源Bug"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: name
+    note: "任务名称"
+    fields:
+    - field: name1
+      range: "子任务"
+    - field: name2
+      range: 1-10
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: type
+    note: "任务类型"
+    range: design,devel,test,study,discuss,ui,affair,misc
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: pri
+    note: "优先级"
+    range: 1-4
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: estimate
+    note: "最初预计"
+    range: 0-10
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: consumed
+    note: "总计消耗"
+    range: 3-12
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: left
+    note: "预计剩余"
+    range: 0-10
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: deadline
+    note: "截止日期"
+    range: "(-1w)-(-1M):-1D"
+    prefix: ""
+    postfix: ""
+    loop: 0
+    type: timestamp
+    format: "YY/MM/DD"
+  - field: status
+    note: "任务状态"
+    range: wait,doing,done,pause,cancel,closed
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: subStatus
+    note: "子状态"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: color
+    note: "标题颜色"
+    from: common.color.v1.yaml
+    use: color
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: mailto
+    note: "抄送给"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: desc
+    note: "任务描述"
+    range: 1-10000
+    prefix: "这里是任务描述"
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: version
+    note: "版本号"
+    range: 1
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: openedBy
+    note: "由谁创建"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: openedDate
+    note: "创建日期"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: assignedTo
+    note: "指派给"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: assignedDate
+    note: "指派日期"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: estStarted
+    note: "预计开始"
+    range: "2022-01-27"
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: "YY/MM/DD"
+    type: timestamp
+  - field: realStarted
+    note: "实际开始"
+    from: common.date.v1.yaml
+    use: dateB
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: "YY/MM/DD"
+    type: timestamp
+  - field: finishedBy
+    note: "由谁完成"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: finishedDate
+    note: "完成日期"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: finishedList
+    note: "完成者列表"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: canceledBy
+    note: "由谁取消"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: canceledDate
+    note: "取消日期"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: closedBy
+    note: "由谁关闭"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: closedDate
+    note: "关闭日期"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: realDuration
+    note: "实际持续时长"
+    range: 1
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: planDuration
+    note: "计划持续时长"
+    range: 1
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: closedReason
+    note: "关闭原因"
+    range: ""
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: lastEditedBy
+    note: "最后修改者"
+    from: common.user.v1.yaml
+    use: user
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: lastEditedDate
+    note: "最后修改时间"
+    from: common.date.v1.yaml
+    use: dateA
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: activatedDate
+    note: "重新激活日期"
+    from: common.date.v1.yaml
+    use: dateB
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: deleted
+    note: "是否删除"
+    range: 0
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index 4eae900058..498dec5383 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -4,6 +4,7 @@ $builder = new stdclass();
 $builder->company   = array('rows' => 1,    'extends' => array('company'));
 $builder->user      = array('rows' => 1000, 'extends' => array('user'));
 $builder->dept      = array('rows' => 100,  'extends' => array('dept'));
+$builder->action    = array('rows' => 100,  'extends' => array('action'));
 
 $builder->program       = array('rows' => 10, 'extends' => array('project', 'program'));
 $builder->project       = array('rows' => 90, 'extends' => array('project', 'project'));
@@ -16,6 +17,7 @@ $builder->taskmore      = array('rows' => 300, 'extends' => array('task','moreta
 $builder->taskspec      = array('rows' => 600, 'extends' => array('taskspec'));
 $builder->taskmodule    = array('rows' => 1800, 'extends' => array('module','taskmodule'));
 $builder->taskestimate  = array('rows' => 600, 'extends' => array('taskestimate'));
+$builder->taskson       = array('rows' => 10,  'extends' => array('task', 'taskson'));
 $builder->case          = array('rows' => 400, 'extends' => array('case'));
 $builder->bug           = array('rows' => 300, 'extends' => array('bug'));
 
diff --git a/test/model/task/computeWorkingHours.php b/test/model/task/computeWorkingHours.php
new file mode 100644
index 0000000000..d466bf4870
--- /dev/null
+++ b/test/model/task/computeWorkingHours.php
@@ -0,0 +1,23 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/task.class.php';
+su('admin');
+
+/**
+
+title=taskModel->computeWorkingHours();
+cid=1
+pid=1
+
+根据taskID计算没有父计划的计划工时 >> 1,0,3,0
+根据taskID计算有父计划的父计划工时 >> 601,18,30,18
+
+*/
+
+$taskIDList = array('1', '601');
+
+$task = new taskTest();
+r($task->computeWorkingHoursTest($taskIDList[0])) && p('id,estimate,consumed,left') && e('1,0,3,0');      //根据taskid计算没有父计划的计划工时
+r($task->computeWorkingHoursTest($taskIDList[1])) && p('id,estimate,consumed,left') && e('601,18,31,13'); //根据taskID计算有父计划的父计划工时
+system("./ztest init");
diff --git a/test/model/task/getProjectID.php b/test/model/task/getProjectID.php
index 76b806d0c1..4607b33c9f 100644
--- a/test/model/task/getProjectID.php
+++ b/test/model/task/getProjectID.php
@@ -6,7 +6,7 @@ su('admin');
 
 /**
 
-title=taskModel->getByList();
+title=taskModel->getProjectID();
 cid=1
 pid=1
 
diff --git a/test/model/task/getStoryComments.php b/test/model/task/getStoryComments.php
new file mode 100644
index 0000000000..bb9bac556f
--- /dev/null
+++ b/test/model/task/getStoryComments.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/task.class.php';
+su('admin');
+
+/**
+
+title=taskModel->getStoryComments();
+cid=1
+pid=1
+
+根据executionID查找projectID >> 11
+
+*/
+
+$storyID = '2';
+
+$task = new taskTest();
+r($task->getStoryCommentsTest($storyID)) && p('comment') && e('这是一个系统日志测试备注' . $storyID); //根据executionID查找projectID
+system("./ztest init");

From a349c5bfebffed3e00e87038ea4b49ad039e2755 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 14:01:41 +0800
Subject: [PATCH 13/35] * Fix bug #20530.

---
 module/execution/js/kanban.js     | 1 +
 module/execution/js/taskkanban.js | 1 +
 module/kanban/js/view.js          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index d39357a3bc..9350f13cd2 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -792,6 +792,7 @@ function handleDropTask($element, event, kanban)
     var newLane  = $newCol.closest('.kanban-lane').data('lane');
     var cardType = $card.find('.kanban-card').data('type');
 
+    if(!oldCol || !newCol || !newLane || !oldLane) return false;
     if(oldCol.id === newCol.id && newLane.id === oldLane.id) return false;
 
     var cardID      = $card.data().id;
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index d10800f92b..7f6ef45962 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -717,6 +717,7 @@ function handleDropTask($element, event, kanban)
     var newLane  = $newCol.closest('.kanban-lane').data('lane');
     var cardType = $card.find('.kanban-card').data('type');
 
+    if(!oldCol || !newCol || !newLane || !oldLane) return false;
     if(oldCol.id === newCol.id && newLane.id === oldLane.id) return false;
 
     var cardID      = $card.data().id;
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index bf5a191c4e..42c5a8a36a 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -976,6 +976,7 @@ function handleDropTask($element, event, kanban)
     var regionID = $card.closest('.region').data('id');
     var kanbanID = $card.closest('#kanban').data('id');
 
+    if(!oldCol || !newCol || !newLane || !oldLane) return false;
     if(oldCol.id === newCol.id && newLane.id === oldLane.id) return false;
 
     var cardID = $card.data().id;

From c2129fa980f0e9258e281a666596ec03c7b04c8b Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 9 Mar 2022 14:09:56 +0800
Subject: [PATCH 14/35] * Finish task #50328.

---
 xuanxuan/extension/xuan/client/ext/control/create.php         | 1 +
 xuanxuan/extension/xuan/client/ext/control/edit.php           | 1 +
 xuanxuan/extension/xuan/im/ext/control/debug.php              | 1 +
 xuanxuan/extension/xuan/im/ext/control/downloadxxdpackage.php | 1 +
 xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php   | 3 ++-
 xuanxuan/extension/xuan/im/ext/control/userlogin.php          | 3 ++-
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xuanxuan/extension/xuan/client/ext/control/create.php b/xuanxuan/extension/xuan/client/ext/control/create.php
index 1adf389c36..8d64dd544f 100644
--- a/xuanxuan/extension/xuan/client/ext/control/create.php
+++ b/xuanxuan/extension/xuan/client/ext/control/create.php
@@ -1,4 +1,5 @@
 <?php
+helper::import('../../control.php');
 class myClient extends client
 {
     public function create()
diff --git a/xuanxuan/extension/xuan/client/ext/control/edit.php b/xuanxuan/extension/xuan/client/ext/control/edit.php
index 0939089d54..901786cc57 100644
--- a/xuanxuan/extension/xuan/client/ext/control/edit.php
+++ b/xuanxuan/extension/xuan/client/ext/control/edit.php
@@ -1,4 +1,5 @@
 <?php
+helper::import('../../control.php');
 class myClient extends client
 {
     public function edit($clientID)
diff --git a/xuanxuan/extension/xuan/im/ext/control/debug.php b/xuanxuan/extension/xuan/im/ext/control/debug.php
index cbc9393c88..d2a22852da 100644
--- a/xuanxuan/extension/xuan/im/ext/control/debug.php
+++ b/xuanxuan/extension/xuan/im/ext/control/debug.php
@@ -1,4 +1,5 @@
 <?php
+helper::import('../../control.php');
 class myIm extends im
 {
     /**
diff --git a/xuanxuan/extension/xuan/im/ext/control/downloadxxdpackage.php b/xuanxuan/extension/xuan/im/ext/control/downloadxxdpackage.php
index fe2370c149..5c8a060f26 100644
--- a/xuanxuan/extension/xuan/im/ext/control/downloadxxdpackage.php
+++ b/xuanxuan/extension/xuan/im/ext/control/downloadxxdpackage.php
@@ -1,4 +1,5 @@
 <?php
+helper::import('../../control.php');
 class myIm extends im
 {
     public function downloadXxdPackage($xxdFileName)
diff --git a/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php b/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php
index d931522eca..0739d8dde2 100644
--- a/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php
+++ b/xuanxuan/extension/xuan/im/ext/control/sysgetserverinfo.php
@@ -1,5 +1,6 @@
 <?php
-class myIm extends im 
+helper::import('../../control.php');
+class myIm extends im
 {
     /**
      * Get serverInfo api.
diff --git a/xuanxuan/extension/xuan/im/ext/control/userlogin.php b/xuanxuan/extension/xuan/im/ext/control/userlogin.php
index 29db91e491..540c5d405b 100644
--- a/xuanxuan/extension/xuan/im/ext/control/userlogin.php
+++ b/xuanxuan/extension/xuan/im/ext/control/userlogin.php
@@ -1,5 +1,6 @@
 <?php
-class myIm extends im 
+helper::import('../../control.php');
+class myIm extends im
 {
     public function userLogin($account = '', $password = '', $options = 0, $userID = 0, $version = '', $device = 'desktop')
     {

From b4c0fff8e087f2814bd5c4fae51331b99e41011a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 14:55:04 +0800
Subject: [PATCH 15/35] * Fix bug #20531.

---
 module/execution/js/taskkanban.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 7f6ef45962..a5eb1b22c4 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -73,7 +73,7 @@ function renderDeadline(deadline)
 function renderStoryItem(item, $item, col)
 {
     var scaleSize = window.kanbanScaleSize;
-    if(+$item.attr('data-scale-size') !== scaleSize) $item.empty().attr('data-scale-size', scaleSize);
+    if($item.attr('data-scale-size') !== scaleSize) $item.empty().attr('data-scale-size', scaleSize);
 
     if(scaleSize <= 3)
     {
@@ -135,7 +135,7 @@ function renderStoryItem(item, $item, col)
 function renderBugItem(item, $item, col)
 {
     var scaleSize = window.kanbanScaleSize;
-    if(+$item.attr('data-scale-size') !== scaleSize) $item.empty().attr('data-scale-size', scaleSize);
+    if($item.attr('data-scale-size') !== scaleSize) $item.empty().attr('data-scale-size', scaleSize);
 
     if(scaleSize <= 3)
     {
@@ -199,7 +199,7 @@ function renderBugItem(item, $item, col)
 function renderTaskItem(item, $item, col)
 {
     var scaleSize = window.kanbanScaleSize;
-    if(+$item.attr('data-scale-size') !== scaleSize)  $item.empty().attr('data-scale-size', scaleSize);
+    if($item.attr('data-scale-size') !== scaleSize)  $item.empty().attr('data-scale-size', scaleSize);
 
     if(scaleSize <= 3)
     {
@@ -298,6 +298,8 @@ function renderColumnCount($count, count, col)
 function renderHeaderCol($col, col, $header, kanban)
 {
     if(col.asParent) $col = $col.children('.kanban-header-col');
+    if($col.children('.actions').context != undefined) return;
+
     var $actions = $('<div class="actions" />');
     var printStoryButton =  printTaskButton = printBugButton = false;
     if(priv.canCreateStory || priv.canBatchCreateStory || priv.canLinkStory || priv.canLinkStoryByPlan) printStoryButton = true;

From 8cd6a13955a94029d6dd1e3037d9b9425bd2ed02 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 15:08:17 +0800
Subject: [PATCH 16/35] * Fix bug #20535.

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

diff --git a/module/kanban/model.php b/module/kanban/model.php
index a9ffd90ade..0dc172b298 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1419,7 +1419,7 @@ class kanbanModel extends model
         $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
         if(empty($lanes)) return array();
 
-        $columns = $this->dao->select('t1.*, t2.`type` as columnType, t2.limit, t2.name as columnName')->from(TABLE_KANBANCELL)->alias('t1')
+        $columns = $this->dao->select('t1.*, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1')
             ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id')
             ->where('t1.kanban')->eq($executionID)
             ->andWhere('t1.`type`')->eq($browseType)
@@ -1460,7 +1460,7 @@ class kanbanModel extends model
                 $columnData[$column->column]['id']         = $column->column;
                 $columnData[$column->column]['type']       = $column->columnType;
                 $columnData[$column->column]['name']       = $column->columnName;
-                $columnData[$column->column]['color']      = '#333';
+                $columnData[$column->column]['color']      = $column->color;
                 $columnData[$column->column]['limit']      = $column->limit;
                 $columnData[$column->column]['laneType']   = $browseType;
                 $columnData[$column->column]['asParent']   = in_array($column->columnType, array('develop', 'test', 'resolving')) ? true : false;

From eab4c059a3de9a0a39610f535be95b1f0b1b69fe Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 16:02:00 +0800
Subject: [PATCH 17/35] * Finish task #50388.

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

diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index d36fd514be..33e9c60d5a 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -20,7 +20,7 @@
         <?php echo html::avatar($user, 50); ?>
         <form method='post' class='form-ajax' action=<?php echo inlink('uploadAvatar');?> id='avatarForm' enctype='multipart/form-data'>
           <input type="file" name="files" id="files" class="form-control hidden">
-          <?php echo html::a('javascript:void(0);', '<i class="icon icon-pencil icon-2x"></i>', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->my->uploadAvatar}'");?>
+          <?php if(common::hasPriv('my', 'uploadAvatar')) echo html::a('javascript:void(0);', '<i class="icon icon-pencil icon-2x"></i>', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->my->uploadAvatar}'");?>
         </form>
       </div>
       <span class='user-name'><?php echo $user->realname;?></span>

From 5c17918739fb4a6bbfeda00c6b6c012b5b2dd88e Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 9 Mar 2022 16:02:44 +0800
Subject: [PATCH 18/35] * Fix the extension file of xuanxuan path when loading.

---
 Makefile      |  2 ++
 tools/fixxuan | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tools/fixxuan

diff --git a/Makefile b/Makefile
index db8f5517c0..458db00026 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,8 @@ zentaoxx:
 	sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/extension/xuan/im/control.php
 	sed -i 's/commonModel::getLicensePropertyValue/extCommonModel::getLicensePropertyValue/g' zentaoxx/extension/xuan/im/model/conference.php
 	sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
+	sed -i "s/\$this->app->getModuleRoot() . 'im/apischeme.json'/\$this->app->getExtensionRoot() . 'xuan/im/apischeme.json'/g" zentaoxx/extension/xuan/im/model.php
+	sed -i "/getModuleExtPath(/ r tools/fixxuan" zentaoxx/framework/xuanxuan.class.php
 	echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql
 	mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
 	cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../
diff --git a/tools/fixxuan b/tools/fixxuan
new file mode 100644
index 0000000000..9f7d3708db
--- /dev/null
+++ b/tools/fixxuan
@@ -0,0 +1,13 @@
+        if(!empty($moduleExtPaths))
+        {
+            $extActionFile = $moduleExtPaths['common'] . $methodName . '.php';
+            if(file_exists($extActionFile))
+            {
+                $control = $extActionFile;
+            }
+            else
+            {
+                $extActionFile = $moduleExtPaths['xuan'] . $methodName . '.php';
+                if(file_exists($extActionFile)) $control = $extActionFile;
+            }
+        }

From 1afb4315bec88a5493499cc045a41aca0b4b5a45 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 16:06:41 +0800
Subject: [PATCH 19/35] * Finish task #50389.

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

diff --git a/module/story/model.php b/module/story/model.php
index bd97909090..992dd8660b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3925,7 +3925,7 @@ class storyModel extends model
                 }
                 if($storyType == 'requirement') echo '<span class="label label-badge label-light">SR</span> ';
                 if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}";
-                if(isset($branches[$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
+                if(isset($branches[$story->branch]) and $showBranch and $this->config->vision == 'rnd') echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
                 if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
                 if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
                 echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";

From ffd4850a9d38352379910496af81d0718c64c979 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 9 Mar 2022 16:17:32 +0800
Subject: [PATCH 20/35] * Finish task #20479.

---
 module/story/control.php | 9 ++++++---
 module/task/js/create.js | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 814e3a8ca2..78df5d6ae0 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1988,20 +1988,23 @@ class story extends control
      *
      * @param  int    $executionID
      * @param  int    $productID
+     * @param  int    $branch
+     * @param  int    $moduleID
      * @param  int    $storyID
      * @param  string $number
-     * @param  string $type
+     * @param  string $type full
+     * @param  string $status all|unclosed
      * @access public
      * @return void
      */
-    public function ajaxGetExecutionStories($executionID, $productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $number = '', $type= 'full')
+    public function ajaxGetExecutionStories($executionID, $productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $number = '', $type = 'full', $status = 'all')
     {
         if($moduleID)
         {
             $moduleID = $this->loadModel('tree')->getStoryModule($moduleID);
             $moduleID = $this->tree->getAllChildID($moduleID);
         }
-        $stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type);
+        $stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type, $status);
         if($this->app->getViewType() === 'json')
         {
             return print(json_encode($stories));
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 691e4817e5..4afe1f03e8 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -273,7 +273,7 @@ function loadModuleRelated()
 /* Get select of stories.*/
 function setStories(moduleID, executionID)
 {
-    link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID);
+    link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID + '&storyID=0&number=&type=full&status=unclosed');
     $.get(link, function(stories)
     {
         var storyID = $('#story').val();

From 81851a364859c7a26f135a3a191e32e72ac8b9d7 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Wed, 9 Mar 2022 16:18:01 +0800
Subject: [PATCH 21/35] * fix bug #20476 #20475

---
 extension/lite/group/ext/lang/en/lite.php    | 9 +++++++++
 extension/lite/group/ext/lang/zh-cn/lite.php | 9 +++++++++
 extension/lite/task/ext/view/create.html.php | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/extension/lite/group/ext/lang/en/lite.php b/extension/lite/group/ext/lang/en/lite.php
index 71b1dad82e..58d3cdaab8 100644
--- a/extension/lite/group/ext/lang/en/lite.php
+++ b/extension/lite/group/ext/lang/en/lite.php
@@ -1,2 +1,11 @@
 <?php
 include dirname(dirname(__FILE__)) . '/resource.php';
+
+if($this->config->edition != 'open')
+{
+    $lang->resource->company->todo      = 'companyTodo';
+    $lang->resource->company->calendar  = 'effortCalendar';
+    $lang->resource->company->allTodo   = 'allTodo';
+    $lang->resource->company->effort    = 'companyEffort';
+    $lang->resource->company->alleffort = 'allEffort';
+}
\ No newline at end of file
diff --git a/extension/lite/group/ext/lang/zh-cn/lite.php b/extension/lite/group/ext/lang/zh-cn/lite.php
index 71b1dad82e..58d3cdaab8 100644
--- a/extension/lite/group/ext/lang/zh-cn/lite.php
+++ b/extension/lite/group/ext/lang/zh-cn/lite.php
@@ -1,2 +1,11 @@
 <?php
 include dirname(dirname(__FILE__)) . '/resource.php';
+
+if($this->config->edition != 'open')
+{
+    $lang->resource->company->todo      = 'companyTodo';
+    $lang->resource->company->calendar  = 'effortCalendar';
+    $lang->resource->company->allTodo   = 'allTodo';
+    $lang->resource->company->effort    = 'companyEffort';
+    $lang->resource->company->alleffort = 'allEffort';
+}
\ No newline at end of file
diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php
index 6583ef2260..a3fb48075c 100644
--- a/extension/lite/task/ext/view/create.html.php
+++ b/extension/lite/task/ext/view/create.html.php
@@ -95,7 +95,7 @@
         <tr>
           <th><?php echo $lang->task->story;?></th>
           <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, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
+            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->project"), $lang->execution->linkStory, '_blank', '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) ? '': $stories[$task->story]), $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>

From 1076396a79fe464cfebcb8e64bd3d8a4889b3277 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Wed, 9 Mar 2022 16:20:53 +0800
Subject: [PATCH 22/35] * Refactor upgrade.

---
 module/upgrade/model.php | 132 ++++++++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 56 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8ce2a4e81f..d2cff73445 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -27,6 +27,50 @@ class upgradeModel extends model
         $this->loadModel('setting');
     }
 
+    /**
+     * Get versions to update
+     *
+     * @param  mixed $openVersion
+     * @access public
+     * @return array
+     */
+    public function getVersionsToUpdate($openVersion)
+    {
+        $versions = array();
+        $edition  = $this->config->edition;
+
+        /* Always update open. */
+        foreach($this->lang->upgrade->fromVersions as $version => $versionName)
+        {
+            if(!is_numeric($version[0])) continue;
+            if(version_compare(str_replace('_', '.', $version), str_replace('_', '.', $openVersion)) < 0) continue;
+            $versions[$version] = array('pro' => array(), 'biz' => array(), 'max' => array());
+        }
+        if($edition == 'open') return $versions;
+
+        /* Update to pro|biz|max. */
+        foreach($this->config->upgrade->proVersion as $pro => $open)
+        {
+            if(isset($versions[$open])) $versions[$open]['pro'][] = $pro;
+        }
+        if($edition == 'pro') return $versions;
+
+        /* Update to biz|max. */
+        foreach($this->config->upgrade->bizVersion as $biz => $open)
+        {
+            if(isset($versions[$open])) $versions[$open]['biz'][] = $biz;
+        }
+        if($edition != 'max') return $versions;
+
+        /* Update to max. */
+        foreach($this->config->upgrade->maxVersion as $max => $open)
+        {
+            if(isset($versions[$open])) $versions[$open]['max'][] = $max;
+        }
+
+        return $versions;
+    }
+
     /**
      * The execute method. According to the $fromVersion call related methods.
      *
@@ -38,72 +82,48 @@ class upgradeModel extends model
     {
         set_time_limit(0);
 
-        $editions    = array('p' => 'proVersion', 'b' => 'bizVersion', 'm' => 'maxVersion');
+        $editions    = array('p' => 'pro', 'b' => 'biz', 'm' => 'max');
         $fromEdition = is_numeric($fromVersion[0]) ? 'open' : $editions[$fromVersion[0]];
-        $openVersion = is_numeric($fromVersion[0]) ? $fromVersion : $this->config->upgrade->{$fromEdition}[$fromVersion];
-
-        /* Get versions to be updated. */
-        $versions = array();
-        $edition  = $this->config->edition;
-        foreach($this->lang->upgrade->fromVersions as $version => $versionName)
-        {
-            if(!is_numeric($version[0])) continue;
-            if(version_compare(str_replace('_', '.', $version), str_replace('_', '.', $openVersion)) < 0) continue;
-            $versions[$version] = array('pro' => array(), 'biz' => array(), 'max' => array());
-        }
-        foreach($this->config->upgrade->proVersion as $pro => $open)
-        {
-            if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'pro') $versions[$open]['pro'][] = $pro;
-        }
-        foreach($this->config->upgrade->bizVersion as $biz => $open)
-        {
-            if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'biz') $versions[$open]['biz'][] = $biz;
-        }
-        foreach($this->config->upgrade->maxVersion as $max => $open)
-        {
-            if(!isset($versions[$open])) continue;
-            if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'max') $versions[$open]['max'][] = $max;
-        }
 
         /* If the 'current openVersion' is not equal the 'from openVersion', must update structure. */
         $currentVersion  = str_replace('.', '_', $this->config->version);
-        $updateStructure = $openVersion != ($this->config->edition == 'open' ? $currentVersion : $this->config->upgrade->{$this->config->edition . 'Version'}[$currentVersion]);
 
         /* Execute. */
+        $fromOpenVersion = is_numeric($fromVersion[0]) ? $fromVersion : $this->config->upgrade->{$fromEdition . 'Version'}[$fromVersion];
+        $versions        = $this->getVersionsToUpdate($fromOpenVersion);
         foreach($versions as $openVersion => $chargedVersions)
         {
             $executeXuanxuan = false;
-            switch($fromEdition)
-            {
-                case 'open':
-                    if(str_replace('_', '.', $openVersion) == '10.1') $executeXuanxuan = true;
 
-                    $this->saveLogs("Execute $openVersion");
-                    $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $openVersion)));
-                    $this->executeOpen($openVersion, $fromVersion, $executeXuanxuan);
-                case 'pro':
-                    foreach($chargedVersions['pro'] as $proVersion)
-                    {
-                        $this->saveLogs("Execute $proVersion");
-                        if($updateStructure) $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $proVersion)));
-                        if($this->config->edition != 'open') $this->executePro($proVersion);
-                    }
-                case 'biz':
-                    foreach($chargedVersions['biz'] as $bizVersion)
-                    {
-                        $this->saveLogs("Execute $bizVersion");
-                        if($updateStructure) $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $bizVersion)));
-                        if($this->config->edition != 'open') $this->executeBiz($bizVersion, $executeXuanxuan);
-                    }
-                case 'max':
-                    foreach($chargedVersions['max'] as $maxVersion)
-                    {
-                        $maxVersion = array_search($openVersion, $this->config->upgrade->maxVersion);
-                        $this->saveLogs("Execute $maxVersion");
-                        if($updateStructure) $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $maxVersion)));
-                    }
+            /* Execute open. */
+            if(str_replace('_', '.', $openVersion) == '10.1') $executeXuanxuan = true;
+
+            $this->saveLogs("Execute $openVersion");
+            $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $openVersion)));
+            $this->executeOpen($openVersion, $fromVersion, $executeXuanxuan);
+
+            /* Execute pro. */
+            foreach($chargedVersions['pro'] as $proVersion)
+            {
+                $this->saveLogs("Execute $proVersion");
+                $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $proVersion)));
+                $this->executePro($proVersion);
+            }
+
+            /* Execute biz. */
+            foreach($chargedVersions['biz'] as $bizVersion)
+            {
+                $this->saveLogs("Execute $bizVersion");
+                $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $bizVersion)));
+                $this->executeBiz($bizVersion, $executeXuanxuan);
+            }
+
+            /* Execute max. */
+            foreach($chargedVersions['max'] as $maxVersion)
+            {
+                $maxVersion = array_search($openVersion, $this->config->upgrade->maxVersion);
+                $this->saveLogs("Execute $maxVersion");
+                $this->execSQL($this->getUpgradeFile(str_replace('_', '.', $maxVersion)));
             }
         }
 

From df4497c8904fe35c66abf01a0bf88ac8e8b80dff Mon Sep 17 00:00:00 2001
From: liyang <“liyang@easycorp.ltd”>
Date: Wed, 9 Mar 2022 17:05:24 +0800
Subject: [PATCH 23/35] Add kanban data

---
 test/class/execution.class.php     | 22 +++++++++
 test/data/kanban.yaml              | 54 ++++++++++++++++++++++
 test/data/kanbancard.yaml          | 72 ++++++++++++++++++++++++++++++
 test/data/kanbancell.yaml          | 22 +++++++++
 test/data/kanbancellproject.yaml   | 17 +++++++
 test/data/kanbancolumn.yaml        | 30 +++++++++++++
 test/data/kanbancolumnproject.yaml | 31 +++++++++++++
 test/data/kanbangroup.yaml         | 11 +++++
 test/data/kanbangroupproject.yaml  | 13 ++++++
 test/data/kanbanlane.yaml          | 27 +++++++++++
 test/data/kanbanlaneproject.yaml   | 27 +++++++++++
 test/data/kanbanregion.yaml        | 25 +++++++++++
 test/data/kanbanregionproject.yaml | 27 +++++++++++
 test/data/kanbanspace.yaml         | 67 +++++++++++++++++++++++++++
 test/data/planstory.yaml           | 12 +++++
 test/data/productplan.yaml         | 24 +++++-----
 test/data/project.yaml             |  2 +-
 test/data/projectproduct.yaml      |  2 +-
 test/data/zentao/config.php        | 19 +++++++-
 test/data/zentao/processor.php     | 63 ++++++++++++++++++++++++++
 20 files changed, 552 insertions(+), 15 deletions(-)
 create mode 100644 test/data/kanban.yaml
 create mode 100644 test/data/kanbancard.yaml
 create mode 100644 test/data/kanbancell.yaml
 create mode 100644 test/data/kanbancellproject.yaml
 create mode 100644 test/data/kanbancolumn.yaml
 create mode 100644 test/data/kanbancolumnproject.yaml
 create mode 100644 test/data/kanbangroup.yaml
 create mode 100644 test/data/kanbangroupproject.yaml
 create mode 100644 test/data/kanbanlane.yaml
 create mode 100644 test/data/kanbanlaneproject.yaml
 create mode 100644 test/data/kanbanregion.yaml
 create mode 100644 test/data/kanbanregionproject.yaml
 create mode 100644 test/data/kanbanspace.yaml
 create mode 100644 test/data/planstory.yaml

diff --git a/test/class/execution.class.php b/test/class/execution.class.php
index 53e16204e6..835f679a7f 100644
--- a/test/class/execution.class.php
+++ b/test/class/execution.class.php
@@ -721,4 +721,26 @@ class executionTest
         }
     }
 
+    public function unlinkStoryTest($executionID, $count)
+    {
+        global $tester;
+        $tester->dbh->query("delete from zt_projectstory where project = $executionID");
+
+        $this->objectModel->unlinkStory($executionID);
+        if(dao::isError())
+        {
+            $error = dao::getError();
+            return $error;
+        }
+        elseif($count == "1")
+        {
+            $object = $tester->dbh->query("select * from zt_projectstory where project = $executionID")->fetchAll();
+            return count($object);
+        }
+        else
+        {
+            $object = $tester->dbh->query("select * from zt_projectstory where project = $executionID")->fetchAll();
+            return $object;
+        }
+    }
 }
diff --git a/test/data/kanban.yaml b/test/data/kanban.yaml
new file mode 100644
index 0000000000..278b4744ef
--- /dev/null
+++ b/test/data/kanban.yaml
@@ -0,0 +1,54 @@
+title: table zt_kanban
+desc: "看板表"
+author: automated export
+version: "1.0"
+fields:
+    - field: space
+      range: 1-50{2}
+    - field: name
+      fields:
+        - field: name1
+          range: 通用看板
+        - field: name2
+          range: 1-10000
+    - field: owner
+      range: admin
+    - field: team
+      range: ""
+    - field: desc
+      range: "看板详情"
+    - field: acl
+      range: extend,open
+    - field: whitelist
+      range: ""
+    - field: archived
+      range: "1"
+    - field: performable
+      range: "0"
+    - field: status
+      range: "active"
+    - field: order
+      range: 5-10000:5
+    - field: displayCards
+      range: "0"
+    - field: fluidBoard
+      range: "0"
+    - field: object
+      range: ""
+    - field: createdBy
+      range: "admin"
+    - field: createdDate
+      range: "(-1M)-(+M):1D"
+      type: timestamp
+      format: "YYYY-MM-DD"
+      prefix: "\t"
+    - field: lastEditedBy
+      range: ""
+    - field: lastEditedDate
+      range: ""
+    - field: closedBy
+      range: ""
+    - field: closedDate
+      range: ""
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbancard.yaml b/test/data/kanbancard.yaml
new file mode 100644
index 0000000000..3e6be51320
--- /dev/null
+++ b/test/data/kanbancard.yaml
@@ -0,0 +1,72 @@
+title: table zt_kanbancard
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: kanban
+      range: 1-100{8}
+    - field: region
+      range: 1-100{8}
+    - field: group
+      range: 1-100{8}
+    - field: fromID
+      range: "0"
+    - field: fromType
+      range: ""
+    - field: name
+      range: 1-1000000
+      prefix: "卡片"
+    - field: status
+      range: "doing"
+    - field: pri
+      range: "3"
+    - field: assignedTo
+      range: "admin"
+    - field: desc
+      range: ""
+    - field: begin
+      range: "(-2M)-(+M):1D"
+      type: timestamp
+      format: "YY/MM/DD"
+      postfix: "\t"
+    - field: end
+      range: "(+1w)-(+2M):1D"
+      type: timestamp
+      format: "YY/MM/DD"
+      postfix: "\t"
+    - field: estimate
+      range: "0"
+    - field: color
+      range: "#fff"
+    - field: acl
+      range: "open"
+    - field: whitelist
+      range: ""
+    - field: order
+      range: 1-2
+    - field: archived
+      range: "0"
+    - field: createdBy
+      range: "admin"
+    - field: createdDate
+      range: "(-2M)-(+M):1D"
+      type: timestamp
+      format: "YY/MM/DD"
+      postfix: "\t"
+    - field: lastEditedBy
+      range: ""
+    - field: lastEditedDate
+      range: ""
+    - field: archivedBy
+      range: ""
+    - field: archivedDate
+      range: ""
+    - field: assignedBy
+      range: ""
+    - field: assignedDate
+      range: "(-2M)-(+M):1D"
+      type: timestamp
+      format: "YY/MM/DD"
+      postfix: "\t"
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbancell.yaml b/test/data/kanbancell.yaml
new file mode 100644
index 0000000000..fb53137baa
--- /dev/null
+++ b/test/data/kanbancell.yaml
@@ -0,0 +1,22 @@
+title: table zt_kanbancell
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: kanban
+      range: 1-100{4}
+    - field: lane
+      range: 1-100{4}
+    - field: column
+      range: 1-400
+    - field: type
+      range: "common"
+    - field: cards
+      fields:
+        - field: card1
+          prefix: ","
+          postfix: ","
+          range: 1-800:2
+        - field: card2
+          postfix: ","
+          range: 2-800:2
diff --git a/test/data/kanbancellproject.yaml b/test/data/kanbancellproject.yaml
new file mode 100644
index 0000000000..78265efcd9
--- /dev/null
+++ b/test/data/kanbancellproject.yaml
@@ -0,0 +1,17 @@
+title: table zt_kanbancell
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 401-10000
+    - field: kanban
+      range: 161-190{27},251-180{27},341-370{27},431-460{27},521-550{27},611-640{27}
+    - field: lane
+      range: 1-100{4}
+    - field: column
+      range: 401-5260
+    - field: type
+      range: story{11},bug{9},task{7}
+    - field: cards
+      range: ""
diff --git a/test/data/kanbancolumn.yaml b/test/data/kanbancolumn.yaml
new file mode 100644
index 0000000000..973e894b3e
--- /dev/null
+++ b/test/data/kanbancolumn.yaml
@@ -0,0 +1,30 @@
+title: table zt_kanbancolumn
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: lane
+      range: "0"
+    - field: parent
+      range: "0"
+    - field: type
+      range: 1-400
+      prefix: "column"
+    - field: region
+      range: 1-100{4}
+    - field: group
+      range: 1-100{4}
+    - field: name
+      range: 未开始,进行中,已完成,已关闭
+    - field: color
+      range: "#333"
+    - field: limit
+      range: ""
+    - field: order
+      range: 1-4
+    - field: cards
+      range: ""
+    - field: archived
+      range: "0"
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbancolumnproject.yaml b/test/data/kanbancolumnproject.yaml
new file mode 100644
index 0000000000..f380021651
--- /dev/null
+++ b/test/data/kanbancolumnproject.yaml
@@ -0,0 +1,31 @@
+title: table zt_kanbancolumn
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 401-100000
+    - field: lane
+      range: "0"
+    - field: parent
+      range: "0"
+    - field: type
+      range: [backlog,ready,develop,developing,developed,test,testing,tested,verified,released,closed,unconfirmed,confirmed,resolving,fixing,fixed,test,testing,tested,closed,wait,develop,developing,developed,pause,canceled,closed]
+    - field: region
+      range: 101-280{27}
+    - field: group
+      range: "0"
+    - field: name
+      range: Backlog,准备好,开发,进行中,完成,测试,进行中,完成,已验收,已发布,已关闭,待确认,已确认,解决中,进行中,完成,测试,测试中,测试完毕,已关闭,未开始,开发,研发中,研发完毕,已暂停,已取消,已关闭
+    - field: color
+      range: "#333"
+    - field: limit
+      range: ""
+    - field: order
+      range: "0"
+    - field: cards
+      range: ""
+    - field: archived
+      range: "0"
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbangroup.yaml b/test/data/kanbangroup.yaml
new file mode 100644
index 0000000000..cfdc8fb0aa
--- /dev/null
+++ b/test/data/kanbangroup.yaml
@@ -0,0 +1,11 @@
+title: table zt_kanbangroup
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: kanban
+      range: 1-100
+    - field: region
+      range: 1-100
+    - field: order
+      range: 5-100000:5
diff --git a/test/data/kanbangroupproject.yaml b/test/data/kanbangroupproject.yaml
new file mode 100644
index 0000000000..76b36b4d45
--- /dev/null
+++ b/test/data/kanbangroupproject.yaml
@@ -0,0 +1,13 @@
+title: table zt_kanbangroup
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 101-10000
+    - field: kanban
+      range: 161-190,251-180,341-370,431-460,521-550,611-640
+    - field: region
+      range: 101-10000{3}
+    - field: order
+      range: 1-3
diff --git a/test/data/kanbanlane.yaml b/test/data/kanbanlane.yaml
new file mode 100644
index 0000000000..52e329671b
--- /dev/null
+++ b/test/data/kanbanlane.yaml
@@ -0,0 +1,27 @@
+title: table zt_kanbanlane
+desc: "看板泳道"
+author: automated export
+version: "1.0"
+fields:
+    - field: execution
+      range: "0"
+    - field: type
+      range: "common"
+    - field: region
+      range: 1-100
+    - field: group
+      range: 1-100
+    - field: groupby
+      range: ""
+    - field: extra
+      range: ""
+    - field: name
+      range: "默认泳道"
+    - field: color
+      range: "#7ec5ff"
+    - field: order
+      range: 5-10000:5
+    - field: lastEditedTime
+      range: ""
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbanlaneproject.yaml b/test/data/kanbanlaneproject.yaml
new file mode 100644
index 0000000000..14fb861c10
--- /dev/null
+++ b/test/data/kanbanlaneproject.yaml
@@ -0,0 +1,27 @@
+title: table zt_kanbanlane
+desc: "看板泳道"
+author: automated export
+version: "1.0"
+fields:
+    - field: execution
+      range: 161-190{3},251-180{3},341-370{3},431-460{3},521-550{3},611-640{3}
+    - field: type
+      range: story,bug,task
+    - field: region
+      range: 101-280{3}
+    - field: group
+      range: 101-640
+    - field: groupby
+      range: ""
+    - field: extra
+      range: ""
+    - field: name
+      range: 研发需求,Bug,任务
+    - field: color
+      range: [#7ec5ff,#333,#2b529c]
+    - field: order
+      range: 5-15:5
+    - field: lastEditedTime
+      range: ""
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbanregion.yaml b/test/data/kanbanregion.yaml
new file mode 100644
index 0000000000..47c980e689
--- /dev/null
+++ b/test/data/kanbanregion.yaml
@@ -0,0 +1,25 @@
+title: table zt_kanbanregion
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: space
+      range: 1-50{2}
+    - field: kanban
+      range: 1-100
+    - field: name
+      range: "默认区域"
+    - field: order
+      range: 5-10000:5
+    - field: createdDate
+      range: "(-1M)-(+M):1D"
+      type: timestamp
+      format: "YYYY-MM-DD"
+    - field: createdBy
+      range: "admin"
+    - field: lastEditedBy
+      range: ""
+    - field: lastEditedDate
+      range: ""
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbanregionproject.yaml b/test/data/kanbanregionproject.yaml
new file mode 100644
index 0000000000..7786857225
--- /dev/null
+++ b/test/data/kanbanregionproject.yaml
@@ -0,0 +1,27 @@
+title: table zt_kanbanregion
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 101-10000
+    - field: space
+      range: 0
+    - field: kanban
+      range: 161-190,251-180,341-370,431-460,521-550,611-640
+    - field: name
+      range: "默认区域"
+    - field: order
+      range: 1
+    - field: createdDate
+      range: "(-1M)-(+M):1D"
+      type: timestamp
+      format: "YYYY-MM-DD"
+    - field: createdBy
+      range: "admin"
+    - field: lastEditedBy
+      range: ""
+    - field: lastEditedDate
+      range: ""
+    - field: deleted
+      range: "0"
diff --git a/test/data/kanbanspace.yaml b/test/data/kanbanspace.yaml
new file mode 100644
index 0000000000..56881803f0
--- /dev/null
+++ b/test/data/kanbanspace.yaml
@@ -0,0 +1,67 @@
+title: table zt_kanbanspace
+desc: "看板空间"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    fields:
+    range: 1-10000
+    prefix: ""
+    postfix: ""
+    format: ""
+  - field: type
+    note: "类型"
+    range: cooperation,private,public
+    prefix: ""
+    postfix: ""
+    format: ""
+  - field: team
+    note: "团队"
+    range: admin
+    prefix: ","
+    postfix: ""
+    format: ""
+  - field: owner
+    note: "所属者"
+    fields:
+      - field: account1
+        range: admin{10},user{10},test{10},pm{10},po{10}
+      - field: account2
+        range: [],3-100,1-100,1-100,1-100
+    prefix: ""
+    postfix: ""
+  - field: acl
+    note: "权限"
+    range: open,private
+    prefix: ""
+    postfix: ""
+  - field: createdBy
+    note: "创建者"
+    range: admin
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: createdDate
+    note: "创建日期"
+    range: "(-1M)-(+M):1D"
+    prefix: "\t"
+    type: timestamp
+    format: "YYYY-MM-DD"
+  - field: lastEditedDate
+    note: "最后编辑日期"
+    range: ""
+    prefix: ""
+    postfix: ""
+    tampoop: 0
+  - field: closedDate
+    note: "关闭时间"
+    range: ""
+    prefix: ""
+    postfix: ""
+  - field: deleted
+    note: ""
+    range: 0
+    prefix: ""
+    postfix: ""
diff --git a/test/data/planstory.yaml b/test/data/planstory.yaml
new file mode 100644
index 0000000000..bfcbff837b
--- /dev/null
+++ b/test/data/planstory.yaml
@@ -0,0 +1,12 @@
+title: table zt_planstory
+desc: "需求计划关联表"
+author: sgm
+version: "1.0"
+fields:
+  - field: plan
+    range: 1-360:3{4}
+  - field: story
+    range: 1-400
+  - field: order
+    note: "排序"
+    range: 5-100000:5
diff --git a/test/data/productplan.yaml b/test/data/productplan.yaml
index c1cd6108da..c06e154f1e 100644
--- a/test/data/productplan.yaml
+++ b/test/data/productplan.yaml
@@ -1,24 +1,24 @@
 title: table zt_productplan
 desc: "产品计划"
-author: sgm 
+author: sgm
 version: "1.0"
 fields:
   - field: id
     note: "ID"
     range: 1-10000
-  - field: product 
+  - field: product
     note: "所属产品"
-    range: 1-120{3}
-  - field: branch 
+    range: 1-10{3}
+  - field: branch
     note: "所属分支"
     range: 0
-  - field: parent 
+  - field: parent
     note: "父计划"
     range: 0
-  - field: title 
+  - field: title
     note: "名称"
     range: [1.0,1.1,长名称好长好长好长好长好长好长好长好长好长好长好长好好长好长好长好长好长好好长好长好长好长好长好好长好长好长好长好长好的名字啊！@ase!!@#%@^&#!]
-  - field: desc 
+  - field: desc
     note: "描述"
     range: <div>
              <p>asdxxxfa阿萨德开机as家世界发卡机发设计费啥登记卡设计费卡加斯加附件阿峰</p>
@@ -27,19 +27,19 @@ fields:
              <p>IUIG是DAU发加速度快哦哦阿萨德几年内发，，，奥斯丁，，，切，，，请问加十多年你</p>
              <p>IU风格就叫阿萨德奥斯丁哦IG是DAU，，，奥斯丁，，，切，，，请问加十多年你</p>
            </div>
-  - field: begin 
+  - field: begin
     note: "开始日期"
     range: "(-10M)-(-7M):7D"
     type: timestamp
     format: "YYYY-MM-DD"
-  - field: end 
+  - field: end
     note: "结束日期"
     range: "(-6M)-(+6M):7D"
     type: timestamp
     format: "YYYY-MM-DD"
-  - field: order 
+  - field: order
     note: "排序"
     value: "$id * 5"
-  - field: deleted 
+  - field: deleted
     note: "是否删除"
-    range: 0{359},1 
+    range: 0{359},1
diff --git a/test/data/project.yaml b/test/data/project.yaml
index 6a2dc77588..f96d69954f 100644
--- a/test/data/project.yaml
+++ b/test/data/project.yaml
@@ -3,7 +3,7 @@ author: Zhu Jinyong
 version: "1.0"
 fields:
   - field: project
-    range: 0
+    range: 1-10
   - field: model
     range: scrum{30},waterfall{30},kanban{30}
   - field: name
diff --git a/test/data/projectproduct.yaml b/test/data/projectproduct.yaml
index c2cdc5717d..9d047617a5 100644
--- a/test/data/projectproduct.yaml
+++ b/test/data/projectproduct.yaml
@@ -9,4 +9,4 @@ fields:
   - field: branch
     range: 0
   - field: plan
-    range: 0
+    range: 1-360:3
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index 4eae900058..79f71e8052 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -11,6 +11,7 @@ $builder->sprint        = array('rows' => 600, 'extends' => array('project', 'ex
 
 $builder->story         = array('rows' => 400, 'extends' => array('story'));
 $builder->storymodule   = array('rows' => 800, 'extends' => array('module','storymodule'));
+$builder->storyplan     = array('rows' => 400, 'extends' => array('planstory'));
 $builder->task          = array('rows' => 600, 'extends' => array('task','task'));
 $builder->taskmore      = array('rows' => 300, 'extends' => array('task','moretask'));
 $builder->taskspec      = array('rows' => 600, 'extends' => array('taskspec'));
@@ -21,10 +22,26 @@ $builder->bug           = array('rows' => 300, 'extends' => array('bug'));
 
 $builder->product        = array('rows' => 100, 'extends' => array('product'));
 $builder->productline    = array('rows' => 20,  'extends' => array('module', 'productline'));
-$builder->productplan    = array('rows' => 360, 'extends' => array('productplan'));
+$builder->productplan    = array('rows' => 30, 'extends' => array('productplan'));
 $builder->branch         = array('rows' => 240, 'extends' => array('branch'));
 $builder->projectproduct = array('rows' => 200, 'extends' => array('projectproduct'));
 
+$builder->kanbanspace  = array('rows' => 50, 'extends' => array('kanbanspace'));
+$builder->kanban       = array('rows' => 100, 'extends' => array('kanban'));
+$builder->kanbanregion = array('rows' => 100, 'extends' => array('kanbanregion','kanbanregion'));
+$builder->kanbangroup  = array('rows' => 100, 'extends' => array('kanbangroup','kanbangroup'));
+$builder->kanbanlane   = array('rows' => 100, 'extends' => array('kanbanlane','kanbanlane'));
+$builder->kanbancolumn = array('rows' => 400, 'extends' => array('kanbancolumn','kanbancolumn'));
+$builder->kanbancard   = array('rows' => 800, 'extends' => array('kanbancard','kanbancard'));
+$builder->kanbancell   = array('rows' => 400, 'extends' => array('kanbancell','kanbancell'));
+
+$builder->kanbanregionproject = array('rows' => 180, 'extends' => array('kanbanregion','kanbanregionproject'));
+$builder->kanbangroupproject  = array('rows' => 540, 'extends' => array('kanbangroup','kanbangroupproject'));
+$builder->kanbanlaneproject   = array('rows' => 540, 'extends' => array('kanbanlane','kanbanlaneproject'));
+$builder->kanbancolumnproject = array('rows' => 4860, 'extends' => array('kanbancolumn','kanbancolumnproject'));
+$builder->kanbancellproject   = array('rows' => 4860, 'extends' => array('kanbancell','kanbancellproject'));
+
+
 $builder->team              = array('rows' => 400, 'extends' => array('team'));
 $builder->stakeholder       = array('rows' => 1, 'extends' => array('stakeholder'));
 $builder->stageson          = array('rows' => 30, 'extends' => array('project', 'executionson'));
diff --git a/test/data/zentao/processor.php b/test/data/zentao/processor.php
index 66d3117c32..58d0ae0740 100644
--- a/test/data/zentao/processor.php
+++ b/test/data/zentao/processor.php
@@ -44,6 +44,7 @@ class Processor
         $this->initRelease();
         $this->initStakeholder();
         $this->initUserquery();
+        $this->initUpdateKanban();
 
         $this->dao->commit();
     }
@@ -229,4 +230,66 @@ class Processor
         $this->dao->query("INSERT INTO `zt_userquery` (`id`, `account`, `module`, `title`, `form`, `sql`, `shortcut`) VALUES (1, 'admin',    'task', '任务查询测试条件',   'a:60:{s:9:\"fieldname\";s:0:\"\";s:11:\"fieldstatus\";s:0:\"\";s:9:\"fielddesc\";s:0:\"\";s:15:\"fieldassignedTo\";s:0:\"\";s:8:\"fieldpri\";s:1:\"0\";s:14:\"fieldexecution\";s:0:\"\";s:11:\"fieldmodule\";s:4:\"ZERO\";s:13:\"fieldestimate\";s:0:\"\";s:9:\"fieldleft\";s:0:\"\";s:13:\"fieldconsumed\";s:0:\"\";s:9:\"fieldtype\";s:0:\"\";s:12:\"fieldfromBug\";s:0:\"\";s:17:\"fieldclosedReason\";s:0:\"\";s:13:\"fieldopenedBy\";s:0:\"\";s:15:\"fieldfinishedBy\";s:0:\"\";s:13:\"fieldclosedBy\";s:0:\"\";s:13:\"fieldcancelBy\";s:1:\"0\";s:17:\"fieldlastEditedBy\";s:0:\"\";s:11:\"fieldmailto\";s:0:\"\";s:17:\"fieldfinishedList\";s:0:\"\";s:15:\"fieldopenedDate\";s:0:\"\";s:13:\"fielddeadline\";s:0:\"\";s:15:\"fieldestStarted\";s:0:\"\";s:16:\"fieldrealStarted\";s:0:\"\";s:17:\"fieldassignedDate\";s:0:\"\";s:17:\"fieldfinishedDate\";s:0:\"\";s:15:\"fieldclosedDate\";s:0:\"\";s:17:\"fieldcanceledDate\";s:0:\"\";s:19:\"fieldlastEditedDate\";s:0:\"\";s:7:\"fieldid\";s:0:\"\";s:15:\"fieldcanceledBy\";s:0:\"\";s:6:\"andOr1\";s:3:\"AND\";s:6:\"field1\";s:4:\"name\";s:9:\"operator1\";s:7:\"include\";s:6:\"value1\";s:2:\"aa\";s:6:\"andOr2\";s:3:\"and\";s:6:\"field2\";s:2:\"id\";s:9:\"operator2\";s:1:\"=\";s:6:\"value2\";s:0:\"\";s:6:\"andOr3\";s:3:\"and\";s:6:\"field3\";s:6:\"status\";s:9:\"operator3\";s:1:\"=\";s:6:\"value3\";s:0:\"\";s:10:\"groupAndOr\";s:3:\"and\";s:6:\"andOr4\";s:3:\"AND\";s:6:\"field4\";s:4:\"desc\";s:9:\"operator4\";s:7:\"include\";s:6:\"value4\";s:0:\"\";s:6:\"andOr5\";s:3:\"and\";s:6:\"field5\";s:10:\"assignedTo\";s:9:\"operator5\";s:1:\"=\";s:6:\"value5\";s:0:\"\";s:6:\"andOr6\";s:3:\"and\";s:6:\"field6\";s:3:\"pri\";s:9:\"operator6\";s:1:\"=\";s:6:\"value6\";s:1:\"0\";s:6:\"module\";s:4:\"task\";s:9:\"actionURL\";s:77:\"/index.php?m=execution&f=task&executionID=101&status=bySearch&param=myQueryID\";s:10:\"groupItems\";s:1:\"3\";s:8:\"formType\";s:4:\"lite\";}',  '(( 1   AND `name`  LIKE \'%11%\' ) AND ( 1  )) AND deleted = \'0\'',   '0');");
         $this->dao->query("INSERT INTO `zt_userquery` (`id`, `account`, `module`, `title`, `form`, `sql`, `shortcut`) VALUES (2, 'admin',    'executionStory',   '需求查找条件', 'a:56:{s:10:\"fieldtitle\";s:0:\"\";s:13:\"fieldkeywords\";s:0:\"\";s:11:\"fieldstatus\";s:0:\"\";s:10:\"fieldstage\";s:0:\"\";s:8:\"fieldpri\";s:1:\"0\";s:12:\"fieldproduct\";s:1:\"0\";s:11:\"fieldbranch\";s:0:\"\";s:11:\"fieldmodule\";s:4:\"ZERO\";s:9:\"fieldplan\";s:0:\"\";s:13:\"fieldestimate\";s:0:\"\";s:11:\"fieldsource\";s:0:\"\";s:15:\"fieldsourceNote\";s:0:\"\";s:12:\"fieldfromBug\";s:0:\"\";s:13:\"fieldopenedBy\";s:0:\"\";s:15:\"fieldreviewedBy\";s:0:\"\";s:15:\"fieldassignedTo\";s:0:\"\";s:13:\"fieldclosedBy\";s:0:\"\";s:17:\"fieldlastEditedBy\";s:0:\"\";s:11:\"fieldmailto\";s:0:\"\";s:17:\"fieldclosedReason\";s:0:\"\";s:12:\"fieldversion\";s:0:\"\";s:15:\"fieldopenedDate\";s:0:\"\";s:17:\"fieldreviewedDate\";s:0:\"\";s:17:\"fieldassignedDate\";s:0:\"\";s:15:\"fieldclosedDate\";s:0:\"\";s:19:\"fieldlastEditedDate\";s:0:\"\";s:7:\"fieldid\";s:0:\"\";s:6:\"andOr1\";s:3:\"AND\";s:6:\"field1\";s:5:\"title\";s:9:\"operator1\";s:7:\"include\";s:6:\"value1\";s:3:\"362\";s:6:\"andOr2\";s:3:\"and\";s:6:\"field2\";s:2:\"id\";s:9:\"operator2\";s:1:\"=\";s:6:\"value2\";s:0:\"\";s:6:\"andOr3\";s:3:\"and\";s:6:\"field3\";s:8:\"keywords\";s:9:\"operator3\";s:7:\"include\";s:6:\"value3\";s:0:\"\";s:10:\"groupAndOr\";s:3:\"and\";s:6:\"andOr4\";s:3:\"AND\";s:6:\"field4\";s:5:\"stage\";s:9:\"operator4\";s:1:\"=\";s:6:\"value4\";s:0:\"\";s:6:\"andOr5\";s:3:\"and\";s:6:\"field5\";s:6:\"status\";s:9:\"operator5\";s:1:\"=\";s:6:\"value5\";s:0:\"\";s:6:\"andOr6\";s:3:\"and\";s:6:\"field6\";s:3:\"pri\";s:9:\"operator6\";s:1:\"=\";s:6:\"value6\";s:1:\"0\";s:6:\"module\";s:14:\"executionStory\";s:9:\"actionURL\";s:95:\"/index.php?m=execution&f=story&executionID=101&orderBy=pri_desc&type=bySearch&queryID=myQueryID\";s:10:\"groupItems\";s:1:\"3\";s:8:\"formType\";s:4:\"lite\";}',    '(( 1   AND `title`  LIKE \'%362%\' ) AND ( 1  ))', '0');");
     }
+
+    /**
+     * Init initUpdateKanban.
+     *
+     * @access public
+     * @return void
+     */
+    private function initUpdateKanban()
+    {
+        $this->dao->query("update zt_kanbancolumn set `limit` = '-1' where id >= 1 and id <= 400");
+
+        $kanban = $this->dao->select('id,type,region,name,color,`limit`,`order`')->from(TABLE_KANBANCOLUMN)->where('id')->gt('400')->fetchAll();
+        $group = 101;
+        foreach($kanban as $key => $value)
+        {
+            $id = $value->id;
+
+            $value->limit = '-1';
+            if(!isset($value->parent)) $value->parent = 0;
+
+            if(in_array($value->type, ['develop', 'test', 'resolving']))
+            {
+                $value->parent = '-1';
+                $kanban[$key+1]->parent = $value->id;
+                $kanban[$key+2]->parent = $value->id;
+            }
+
+            $value->group = $group;
+            if($value->type == 'closed')
+            {
+                $group++;
+            }
+            unset($value->id);
+            $this->dao->update(TABLE_KANBANCOLUMN)->data($value)->where('id')->eq($id)->exec();
+        }
+
+        $kanbancell = $this->dao->select('id,type')->from(TABLE_KANBANCELL)->where('id')->gt('400')->fetchAll();
+        $kanbanlane = 101;
+        foreach($kanbancell as $key => $value)
+        {
+            $id = $value->id;
+
+            $value->lane = $kanbanlane;
+
+            if($value->type == 'story' && isset($kanbancell[$key+1]) && $kanbancell[$key+1]->type == 'bug')
+            {
+                $kanbanlane++;
+            }
+
+            if($value->type == 'bug' && isset($kanbancell[$key+1]) && $kanbancell[$key+1]->type == 'task')
+            {
+                $kanbanlane++;
+            }
+            if($value->type == 'task' && isset($kanbancell[$key+1]) && $kanbancell[$key+1]->type == 'story')
+            {
+                $kanbanlane++;
+            }
+            unset($value->id);
+            $this->dao->update(TABLE_KANBANCELL)->data($value)->where('id')->eq($id)->exec();
+        }
+        $this->dao->query("update zt_kanbancell set `cards` = '' where  id > 400");
+    }
 }

From 9eb99fed124b0bc873f296af723bd8de6c728fa5 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 9 Mar 2022 17:13:18 +0800
Subject: [PATCH 24/35] * Fix bug #20442.

---
 module/install/control.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/install/control.php b/module/install/control.php
index f4e411121d..5bf3ceac35 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -206,11 +206,13 @@ class install extends control
             if($this->post->importDemoData) $this->install->importDemoData();
             if(dao::isError()) echo js::alert($this->lang->install->errorImportDemoData);
 
-            $this->loadModel('setting')->updateVersion($this->config->version);
-            $this->loadModel('setting')->setItem('system.common.global.flow', $this->post->flow);
-            $this->loadModel('setting')->setItem('system.common.safe.mode', '1');
-            $this->loadModel('setting')->setItem('system.common.safe.changeWeak', '1');
-            $this->loadModel('setting')->setItem('system.common.global.cron', 1);
+            $this->loadModel('setting');
+            $this->setting->updateVersion($this->config->version);
+            $this->setting->setSN();
+            $this->setting->setItem('system.common.global.flow', $this->post->flow);
+            $this->setting->setItem('system.common.safe.mode', '1');
+            $this->setting->setItem('system.common.safe.changeWeak', '1');
+            $this->setting->setItem('system.common.global.cron', 1);
 
             if(strpos($this->app->getClientLang(), 'zh') === 0) $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, 'http://' . $_SERVER['HTTP_HOST'] . $this->app->config->webRoot . 'api.php/v1', '16.0');
             return print(js::locate(inlink('step6'), 'parent'));

From 678253cda20969a8497a740bc921bff83efdd7e9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 9 Mar 2022 17:15:05 +0800
Subject: [PATCH 25/35] * Add auto test for task.

---
 test/class/task.class.php                 | 24 ++++++++++++++++------
 test/model/task/computeBeginAndEnd.php    | 25 +++++++++++++++++++++++
 test/model/task/computeHours4Multiple.php |  0
 test/model/task/computeWorkingHours.php   | 12 ++++++-----
 test/model/task/getExecutionTasks.php     |  6 +++---
 test/model/task/getProjectID.php          |  0
 test/model/task/getStoryComments.php      |  8 +++++---
 test/model/task/getTasksByModule.php      |  8 ++++----
 8 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100755 test/model/task/computeBeginAndEnd.php
 create mode 100644 test/model/task/computeHours4Multiple.php
 mode change 100644 => 100755 test/model/task/computeWorkingHours.php
 mode change 100644 => 100755 test/model/task/getProjectID.php
 mode change 100644 => 100755 test/model/task/getStoryComments.php

diff --git a/test/class/task.class.php b/test/class/task.class.php
index 8373e17752..6c40451c51 100644
--- a/test/class/task.class.php
+++ b/test/class/task.class.php
@@ -537,7 +537,6 @@ class taskTest
     {
         $objectID = $this->objectModel->createTaskFromGitlabIssue($task, $executionID);
 
-        unset($_POST);
         if(dao::isError())
         {
             return dao::getError();
@@ -553,7 +552,6 @@ class taskTest
     {
         $object = $this->objectModel->getProjectID($executionID);
 
-        unset($_POST);
         if(dao::isError())
         {
             return dao::getError();
@@ -564,11 +562,10 @@ class taskTest
         }
     }
 
-    public function getStoryComments($storyID)
+    public function getStoryCommentsTest($storyID)
     {
         $object = $this->objectModel->getStoryComments($storyID);
 
-        unset($_POST);
         if(dao::isError())
         {
             return dao::getError();
@@ -583,7 +580,6 @@ class taskTest
     {
         $result = $this->objectModel->computeWorkingHours($taskID);
 
-        unset($_POST);
         if(dao::isError())
         {
             return dao::getError();
@@ -591,7 +587,23 @@ class taskTest
         else
         {
             $object = $this->objectModel->getById($taskID);
-            if($object->parent) $parentObject = $this->objectModel->getById($object->parent);
+            if(!empty($object) and $object->parent > 0) $parentObject = $this->objectModel->getById($object->parent);
+            return isset($parentObject) ? $parentObject : $object;
+        }
+    }
+
+    public function computeBeginAndEndTest($taskID)
+    {
+        $result = $this->objectModel->computeBeginAndEnd($taskID);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            $object = $this->objectModel->getById($taskID);
+            if(!empty($object) and $object->parent > 0) $parentObject = $this->objectModel->getById($object->parent);
             return isset($parentObject) ? $parentObject : $object;
         }
     }
diff --git a/test/model/task/computeBeginAndEnd.php b/test/model/task/computeBeginAndEnd.php
new file mode 100755
index 0000000000..83c60602c0
--- /dev/null
+++ b/test/model/task/computeBeginAndEnd.php
@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/task.class.php';
+su('admin');
+
+/**
+
+title=taskModel->computeBeginAndEnd();
+cid=1
+pid=1
+
+根据taskID计算没有父计划的开始结束时间 >> 1,2022-03-09,0000-00-00 00:00:00,2022-03-16
+根据taskID计算有父计划的父开始结束时间 >> 601,,0000-00-00 00:00:00,2022-03-02
+根据不存在的taskID计划开始结束时间 >> 0
+
+*/
+
+$taskIDList = array('1', '901', '100001');
+
+$task = new taskTest();
+r($task->computeBeginAndEndTest($taskIDList[0])) && p('id,estStarted,realStarted,deadline') && e('1,2022-03-09,0000-00-00 00:00:00,2022-03-16');   //根据taskID计算没有父计划的开始结束时间
+r($task->computeBeginAndEndTest($taskIDList[1])) && p('id,estStarted,realStarted,deadline') && e('601,,0000-00-00 00:00:00,2022-03-02'); //根据taskID计算有父计划的父开始结束时间
+r($task->computeBeginAndEndTest($taskIDList[2])) && p('id,estStarted,realStarted,deadline') && e('0');            //根据不存在的taskID计算开始结束时间
+system("./ztest init");
diff --git a/test/model/task/computeHours4Multiple.php b/test/model/task/computeHours4Multiple.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/model/task/computeWorkingHours.php b/test/model/task/computeWorkingHours.php
old mode 100644
new mode 100755
index d466bf4870..e057f61eba
--- a/test/model/task/computeWorkingHours.php
+++ b/test/model/task/computeWorkingHours.php
@@ -10,14 +10,16 @@ title=taskModel->computeWorkingHours();
 cid=1
 pid=1
 
-根据taskID计算没有父计划的计划工时 >> 1,0,3,0
-根据taskID计算有父计划的父计划工时 >> 601,18,30,18
+根据taskID计算没有子任务的计划工时 >> 1,0,3,0
+根据taskID计算有子任务的父任务工时 >> 601,18,30,18
+根据不存在的taskID计算工时 >> 0
 
 */
 
-$taskIDList = array('1', '601');
+$taskIDList = array('1', '601', '100001');
 
 $task = new taskTest();
-r($task->computeWorkingHoursTest($taskIDList[0])) && p('id,estimate,consumed,left') && e('1,0,3,0');      //根据taskid计算没有父计划的计划工时
-r($task->computeWorkingHoursTest($taskIDList[1])) && p('id,estimate,consumed,left') && e('601,18,31,13'); //根据taskID计算有父计划的父计划工时
+r($task->computeWorkingHoursTest($taskIDList[0])) && p('id,estimate,consumed,left') && e('1,0,3,0');      //根据taskID计算没有子任务的计划工时
+r($task->computeWorkingHoursTest($taskIDList[1])) && p('id,estimate,consumed,left') && e('601,18,31,13'); //根据taskID计算有父任务的子任务工时
+r($task->computeWorkingHoursTest($taskIDList[2])) && p('id,estimate,consumed,left') && e('0');            //根据不存在的taskID计算工时
 system("./ztest init");
diff --git a/test/model/task/getExecutionTasks.php b/test/model/task/getExecutionTasks.php
index 5fa3332f73..ce7dd5ffaf 100755
--- a/test/model/task/getExecutionTasks.php
+++ b/test/model/task/getExecutionTasks.php
@@ -11,7 +11,7 @@ cid=1
 pid=1
 
 根据执行id获取任务列表 >> 开发任务11
-根据执行id获取任务数量 >> 1
+根据执行id获取任务数量 >> 4
 
 */
 
@@ -20,5 +20,5 @@ $count       = array('0','1');
 
 $task = new taskTest();
 r($task->getExecutionTasksTest($executionID,$count[0])) && p('1:name') && e('开发任务11'); //根据执行id获取任务列表
-r($task->getExecutionTasksTest($executionID,$count[1])) && p()         && e('1');          //根据执行id获取任务数量
-system("./ztest init");
\ No newline at end of file
+r($task->getExecutionTasksTest($executionID,$count[1])) && p()         && e('4');          //根据执行id获取任务数量
+system("./ztest init");
diff --git a/test/model/task/getProjectID.php b/test/model/task/getProjectID.php
old mode 100644
new mode 100755
diff --git a/test/model/task/getStoryComments.php b/test/model/task/getStoryComments.php
old mode 100644
new mode 100755
index bb9bac556f..97780986c5
--- a/test/model/task/getStoryComments.php
+++ b/test/model/task/getStoryComments.php
@@ -10,12 +10,14 @@ title=taskModel->getStoryComments();
 cid=1
 pid=1
 
-根据executionID查找projectID >> 11
+根据storyID查找comment >> 这是一个系统日志测试备注2
+根据storyID查找comment >> 0
 
 */
 
-$storyID = '2';
+$storyIDList = array(2, 1000001);
 
 $task = new taskTest();
-r($task->getStoryCommentsTest($storyID)) && p('comment') && e('这是一个系统日志测试备注' . $storyID); //根据executionID查找projectID
+r($task->getStoryCommentsTest($storyIDList[0])) && p('0:comment') && e('这是一个系统日志测试备注2'); //根据storyID查找comment
+r($task->getStoryCommentsTest($storyIDList[1])) && p('0:comment') && e('0');                         //根据不存在的storyID查找comment
 system("./ztest init");
diff --git a/test/model/task/getTasksByModule.php b/test/model/task/getTasksByModule.php
index 6541590f09..1ed54d1fa9 100755
--- a/test/model/task/getTasksByModule.php
+++ b/test/model/task/getTasksByModule.php
@@ -10,7 +10,7 @@ title=taskModel->getTasksByModule();
 cid=1
 pid=1
 
-根据模块获取任务列表 >> 开发任务11
+根据模块获取任务列表 >> 子任务10
 根据模块获取任务数量 >> 1
 
 */
@@ -21,6 +21,6 @@ $moduleIdList = '21';
 $count = array('0','1');
 
 $task = new taskTest();
-r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[0])) && p('0:name') && e('开发任务11'); //根据模块获取任务列表
-r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[1])) && p()         && e('1');          //根据模块获取任务数量
-system("./ztest init");
\ No newline at end of file
+r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[0])) && p('0:name') && e('子任务10'); //根据模块获取任务列表
+r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[1])) && p()         && e('1');        //根据模块获取任务数量
+system("./ztest init");

From 41e2e45e8a783d4b388bf8f6a22b8e0e754d6509 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 9 Mar 2022 09:27:42 +0000
Subject: [PATCH 26/35] * Fix bug#20464

---
 module/custom/model.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/module/custom/model.php b/module/custom/model.php
index 2576344129..10c3543c0f 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -244,6 +244,18 @@ class customModel extends model
                 $link = explode('|', $link);
                 list($label, $module, $method) = $link;
                 $hasPriv = commonModel::hasPriv($module, $method);
+                /* Fix bug#20464 */
+                if(!$hasPriv and is_array($item) and isset($item['subMenu']))
+                {
+                    foreach($item['subMenu'] as $subMenu)
+                    {
+                        if(!isset($subMenu['link'])) continue;
+                        list($subLabel, $module, $method) = explode('|', $subMenu['link']);
+                        $hasPriv = commonModel::hasPriv($module, $method);
+                        if($hasPriv == true) break;
+                    }
+                }
+
                 if($module == 'execution' and $method == 'more') $hasPriv = true;
                 if($module == 'project' and $method == 'other')  $hasPriv = true;
             }

From 546ae70c0df1ad2c6b7ca8f1b3e3916d9ed43fc6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 10 Mar 2022 08:44:31 +0800
Subject: [PATCH 27/35] * Fix bug #20090.

---
 module/upgrade/model.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d2cff73445..6286cb7a88 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -457,6 +457,7 @@ class upgradeModel extends model
             case '16_4':
                 set_time_limit(0);
                 $this->updateActivatedDate();
+                $this->updateUserRequired();
 
                 if($fromVersion[0] == 'm') break;
                 $this->execSQL($this->getUpgradeFile('maxinstall'));
@@ -5997,4 +5998,27 @@ class upgradeModel extends model
         }
         file_put_contents($filePath, $content);
     }
+
+    /**
+     * Update user's required settings.
+     *
+     * @access public
+     * @return bool
+     */
+    public function updateUserRequired()
+    {
+        $requiredConfigs = $this->dao->select('*')->from(TABLE_CONFIG)
+            ->where('module')->eq('user')
+            ->andWhere('`key`')->eq('requiredFields')
+            ->andWhere('section')->in('create,edit')
+            ->fetchAll();
+
+        foreach($requiredConfigs as $requiredConfig)
+        {
+            $requiredField = $requiredConfig->value . ',visions';
+            $this->dao->update(TABLE_CONFIG)->set('value')->eq($requiredField)->where('id')->eq($requiredConfig->id)->exec();
+        }
+
+        return true;
+    }
 }

From 549ab5e98f32c8b0bec2192f4977a732814ea676 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 10 Mar 2022 00:53:15 +0000
Subject: [PATCH 28/35] * Adjust code

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

diff --git a/module/custom/model.php b/module/custom/model.php
index 10c3543c0f..15dc1f03d2 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -244,7 +244,7 @@ class customModel extends model
                 $link = explode('|', $link);
                 list($label, $module, $method) = $link;
                 $hasPriv = commonModel::hasPriv($module, $method);
-                /* Fix bug#20464 */
+                /* Fix bug #20464 */
                 if(!$hasPriv and is_array($item) and isset($item['subMenu']))
                 {
                     foreach($item['subMenu'] as $subMenu)
@@ -252,7 +252,7 @@ class customModel extends model
                         if(!isset($subMenu['link'])) continue;
                         list($subLabel, $module, $method) = explode('|', $subMenu['link']);
                         $hasPriv = commonModel::hasPriv($module, $method);
-                        if($hasPriv == true) break;
+                        if($hasPriv) break;
                     }
                 }
 

From 2629c804dc1922b4b07755baa70f29ca18189aeb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 10 Mar 2022 08:55:36 +0800
Subject: [PATCH 29/35] * Change the upgrade program to SQL.

---
 db/update16.4.sql        |  2 ++
 module/upgrade/model.php | 24 ------------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/db/update16.4.sql b/db/update16.4.sql
index d87b04cf5d..c874b5ea6b 100644
--- a/db/update16.4.sql
+++ b/db/update16.4.sql
@@ -29,3 +29,5 @@ INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES
 ('lite', '迅捷版用户分组', 'liteUser', '迅捷版用户分组');
 
 ALTER TABLE `zt_productplan` ADD `closedReason` varchar(20) NOT NULL AFTER `order`;
+
+update zt_config set `value` = concat(`value`, ',visions') where module = 'user' and `key` = 'requiredFields' and section in ('create', 'edit');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 6286cb7a88..d2cff73445 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -457,7 +457,6 @@ class upgradeModel extends model
             case '16_4':
                 set_time_limit(0);
                 $this->updateActivatedDate();
-                $this->updateUserRequired();
 
                 if($fromVersion[0] == 'm') break;
                 $this->execSQL($this->getUpgradeFile('maxinstall'));
@@ -5998,27 +5997,4 @@ class upgradeModel extends model
         }
         file_put_contents($filePath, $content);
     }
-
-    /**
-     * Update user's required settings.
-     *
-     * @access public
-     * @return bool
-     */
-    public function updateUserRequired()
-    {
-        $requiredConfigs = $this->dao->select('*')->from(TABLE_CONFIG)
-            ->where('module')->eq('user')
-            ->andWhere('`key`')->eq('requiredFields')
-            ->andWhere('section')->in('create,edit')
-            ->fetchAll();
-
-        foreach($requiredConfigs as $requiredConfig)
-        {
-            $requiredField = $requiredConfig->value . ',visions';
-            $this->dao->update(TABLE_CONFIG)->set('value')->eq($requiredField)->where('id')->eq($requiredConfig->id)->exec();
-        }
-
-        return true;
-    }
 }

From c7c06be02ad316b278ddf83f577043a8afdeb26c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 10 Mar 2022 09:42:35 +0800
Subject: [PATCH 30/35] * Fix bug #20561.

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

diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 42c5a8a36a..b400a88a37 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1184,7 +1184,7 @@ function createColumnCreateMenu(options)
     var laneID   = col.$kanbanData.lanes[0].id ? col.$kanbanData.lanes[0].id : 0;
     var columnID = col.id;
 
-    if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal'}});
+    if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}});
     if(privs.includes('batchCreateCard')) items.push({label: kanbanLang.batchCreateCard, url: $.createLink('kanban', 'batchCreateCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}});
     if(privs.includes('import') && kanban.object.indexOf('cards') != -1) items.push({label: kanbanLang.importCard, url: $.createLink('kanban', 'importCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal'}});
     if(privs.includes('import') && kanban.object && kanban.object != 'cards') items.push({className: 'parentDivider'});

From b2d61cc993fdf09a32b5c61d3d00864294c6ae42 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Thu, 10 Mar 2022 09:45:30 +0800
Subject: [PATCH 31/35] * Fix upgrade bug.

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

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d2cff73445..b7525fb116 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1130,6 +1130,7 @@ class upgradeModel extends model
         if(empty($version)) $version = $this->config->installedVersion;
 
         $editions    = array('p' => 'proVersion', 'b' => 'bizVersion', 'm' => 'maxVersion');
+        $version     = str_replace('.', '_', $version);
         $fromEdition = is_numeric($version[0]) ? 'open' : $editions[$version[0]];
         $openVersion = is_numeric($version[0]) ? $version : $this->config->upgrade->{$fromEdition}[$version];
         $openVersion = str_replace('_', '.', $openVersion);

From 1748b61779c121c7727d50d1bdb91bcd87db353a Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Thu, 10 Mar 2022 10:01:08 +0800
Subject: [PATCH 32/35] * Fix upgrade error.

---
 db/update11.7.sql        | 1 +
 module/upgrade/model.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/update11.7.sql b/db/update11.7.sql
index f177f5c124..fbf0f9b24f 100644
--- a/db/update11.7.sql
+++ b/db/update11.7.sql
@@ -68,3 +68,4 @@ ALTER TABLE `zt_bug` ADD `entry` varchar(255) COLLATE 'utf8_general_ci' NOT NULL
 ALTER TABLE `zt_repobranch` ADD INDEX `revision` (`revision`);
 
 DELETE FROM `zt_grouppriv` WHERE `module` = 'api' AND `method` = 'sql';
+REPLACE INTO `zt_config` set `owner` = 'system', `module` = 'common', `section` = 'global', `key` = 'showAnnual', `value` = '1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b7525fb116..beb6dddc05 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -354,7 +354,6 @@ class upgradeModel extends model
                 break;
             case '11_7':
                 $this->adjustPriv12_0();
-                $this->loadModel('setting')->setItem('system.common.global.showAnnual', '1');
                 break;
             case '12_0_1':
                 $this->importRepoFromConfig();

From a7d66c5faeeeafefa2f011ef2dbcc7775b3a2c5e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 10 Mar 2022 10:05:34 +0800
Subject: [PATCH 33/35] * Fix bug #20572.

---
 module/custom/control.php         | 2 +-
 module/execution/js/taskkanban.js | 2 +-
 module/projectstory/control.php   | 2 +-
 module/story/model.php            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index 909153542d..dc159ba0c6 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -163,7 +163,7 @@ class custom extends control
                 foreach($_POST['keys'] as $index => $key)
                 {
                     if(!empty($key)) $key = trim($key);
-                    /* Invalid key. It should be numbers. (It includes severityList in bug module and priList in stroy, task, bug, testcasea, testtask and todo module.) */
+                    /* Invalid key. It should be numbers. (It includes severityList in bug module and priList in story, task, bug, testcasea, testtask and todo module.) */
                     if($field == 'priList' or $field == 'severityList')
                     {
                         if(!is_numeric($key) or $key > 255) return $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidNumberKey));
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index a5eb1b22c4..c03748f81b 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -799,7 +799,7 @@ function createColumnCreateMenu(options)
     if(col.laneType == 'story')
     {
         if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID, '', true), className: 'iframe'});
-        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
+        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStory, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
         if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
         if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal'}});
     }
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index 4f5db62636..2907121fc4 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -110,7 +110,7 @@ class projectStory extends control
      * Batch unlink story.
      *
      * @param  int    $projectID
-     * @param  string $stroyIdList
+     * @param  string $storyIdList
      * @access public
      * @return string
      */
diff --git a/module/story/model.php b/module/story/model.php
index 992dd8660b..ced0c50d4e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -647,9 +647,9 @@ class storyModel extends model
 
         $story = fixer::input('post')->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)->get();
 
-        $oldStroyReviewers  = $this->getReviewerPairs($storyID, $oldStory->version);
+        $oldStoryReviewers  = $this->getReviewerPairs($storyID, $oldStory->version);
         $_POST['reviewer']  = isset($_POST['reviewer']) ? $_POST['reviewer'] : array();
-        $reviewerHasChanged = (array_diff(array_keys($oldStroyReviewers), $_POST['reviewer']) or array_diff($_POST['reviewer'], array_keys($oldStroyReviewers)));
+        $reviewerHasChanged = (array_diff(array_keys($oldStoryReviewers), $_POST['reviewer']) or array_diff($_POST['reviewer'], array_keys($oldStoryReviewers)));
         if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or $this->loadModel('file')->getCount() or $reviewerHasChanged) $specChanged = true;
 
         $now   = helper::now();

From a0e7c613f3f412fe373a7c851289d2cb0cedf90d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 10 Mar 2022 10:11:56 +0800
Subject: [PATCH 34/35] * Finish task #50370.

---
 module/story/control.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 78df5d6ae0..e49c4b4974 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1101,8 +1101,6 @@ class story extends control
 
         /* Set the menu. */
         $from = $this->app->tab;
-        $this->product->setMenu($story->product, $story->branch);
-
         if($from == 'execution')
         {
             $this->execution->setMenu($param);
@@ -1116,6 +1114,10 @@ class story extends control
             $products = $this->product->getProductPairsByProject(0, 'noclosed');
             $this->loadModel('qa')->setMenu($products, $story->product);
         }
+        else
+        {
+            $this->product->setMenu($story->product, $story->branch);
+        }
 
         $reviewers          = $this->story->getReviewerPairs($storyID, $story->version);
         $checkSuperReviewed = strpos(',' . trim(zget($this->config->story, 'superReviewers', ''), ',') . ',', ',' . trim($story->reviewedBy, ',') . ',');

From bc8e061128d8a8f423fc500f5fa5c3e733dbcf9b Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Thu, 10 Mar 2022 10:20:45 +0800
Subject: [PATCH 35/35] * Fix upgrade error.

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

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index beb6dddc05..e8c032a130 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -34,10 +34,9 @@ class upgradeModel extends model
      * @access public
      * @return array
      */
-    public function getVersionsToUpdate($openVersion)
+    public function getVersionsToUpdate($openVersion, $fromEdition)
     {
         $versions = array();
-        $edition  = $this->config->edition;
 
         /* Always update open. */
         foreach($this->lang->upgrade->fromVersions as $version => $versionName)
@@ -46,21 +45,21 @@ class upgradeModel extends model
             if(version_compare(str_replace('_', '.', $version), str_replace('_', '.', $openVersion)) < 0) continue;
             $versions[$version] = array('pro' => array(), 'biz' => array(), 'max' => array());
         }
-        if($edition == 'open') return $versions;
+        if($fromEdition == 'open') return $versions;
 
         /* Update to pro|biz|max. */
         foreach($this->config->upgrade->proVersion as $pro => $open)
         {
             if(isset($versions[$open])) $versions[$open]['pro'][] = $pro;
         }
-        if($edition == 'pro') return $versions;
+        if($fromEdition == 'pro') return $versions;
 
         /* Update to biz|max. */
         foreach($this->config->upgrade->bizVersion as $biz => $open)
         {
             if(isset($versions[$open])) $versions[$open]['biz'][] = $biz;
         }
-        if($edition != 'max') return $versions;
+        if($fromEdition == 'biz') return $versions;
 
         /* Update to max. */
         foreach($this->config->upgrade->maxVersion as $max => $open)
@@ -90,7 +89,7 @@ class upgradeModel extends model
 
         /* Execute. */
         $fromOpenVersion = is_numeric($fromVersion[0]) ? $fromVersion : $this->config->upgrade->{$fromEdition . 'Version'}[$fromVersion];
-        $versions        = $this->getVersionsToUpdate($fromOpenVersion);
+        $versions        = $this->getVersionsToUpdate($fromOpenVersion, $fromEdition);
         foreach($versions as $openVersion => $chargedVersions)
         {
             $executeXuanxuan = false;