From 00a0484612402137ae9c36a8f0173663ce1e4a0e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:09:05 +0800
Subject: [PATCH 01/30] * Fix bug #14814.

---
 module/company/css/dynamic.css       | 2 +-
 module/company/view/dynamic.html.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css
index eeb6571277..a26a494018 100644
--- a/module/company/css/dynamic.css
+++ b/module/company/css/dynamic.css
@@ -18,5 +18,5 @@
 .dynamic.collapsed .timeline > li + li {display: none;}
 .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
 
-.c-user, .c-project, .c-product, .c-execution {width: 150px !important;}
+.c-user, .c-project, .c-product, .c-execution {width: 150px !important; overflow: unset;}
 .c-date {width: 200px;}
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 7bd365f98d..f85ae74bb9 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -25,12 +25,12 @@
     echo html::a(inlink('dynamic', "browseType=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
     ?>
     <?php endforeach;?>
-    <div class="input-control space c-user"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
-    <div class="input-control space c-product"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space c-user"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen" data-max_drop_width="215"');?></div>
+    <div class="input-control space c-product"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen" data-max_drop_width="215"');?></div>
     <?php if($config->systemMode == 'new'):?>
-    <div class="input-control space c-project"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
+    <div class="input-control space c-project"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen" data-max_drop_width="215"');?></div>
     <?php endif;?>
-    <div class="input-control space c-execution"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
+    <div class="input-control space c-execution"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen" data-max_drop_width="215"'); ?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
   </div>
 </div>

From f5e33aee87d5b3afc04c08642ed0b83d922bd725 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:14:30 +0800
Subject: [PATCH 02/30] * Finish task#42101

---
 api/v1/entries/build.php  | 51 ++++++++++++++++++++++++++++++++++++++
 api/v1/entries/builds.php | 52 +++++++++++++++++++++++++++++++++++++++
 config/routes.php         |  4 +++
 module/build/control.php  |  6 ++++-
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 api/v1/entries/build.php
 create mode 100644 api/v1/entries/builds.php

diff --git a/api/v1/entries/build.php b/api/v1/entries/build.php
new file mode 100644
index 0000000000..de504a5a3b
--- /dev/null
+++ b/api/v1/entries/build.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * 禅道API的build资源类
+ * 版本V1
+ *
+ * The build entry point of zentaopms
+ * Version 1
+ */
+class buildEntry extends Entry
+{
+    public function get($buildID)
+    {
+        $control = $this->loadController('build', 'view');
+        $control->view($buildID);
+
+        $data = $this->getData();
+        if(!$data or (isset($data->status) and $data->message == '404 Not found')) return $this->send404();
+        if(isset($data->status) and $data->status == 'success') return $this->send(200, $data->data->build);
+        if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
+
+        $this->sendError(400, 'error');
+    }
+
+    public function put($buildID)
+    {
+        $old = $this->loadModel('build')->getByID($buildID);
+
+        /* Set $_POST variables. */
+        $fields = 'type,title,severity,pri,assignedTo,deadline,desc';
+        $this->batchSetPost($fields, $oldBuild);
+
+        $control = $this->loadController('build', 'edit');
+        $control->edit($buildID);
+
+        $data = $this->getData();
+        if(!$data or (isset($data->message) and $data->message == '404 Not found')) return $this->send404();
+        if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
+
+        $build = $this->build->getByID($buildID);
+        $this->send(200, $this->format($build, 'createdDate:time,editedDate:time,assignedDate:time'));
+    }
+
+    public function delete($buildID)
+    {
+        $control = $this->loadController('build', 'delete');
+        $control->delete($buildID, 'true');
+
+        $this->getData();
+        $this->sendSuccess(200, 'success');
+    }
+}
diff --git a/api/v1/entries/builds.php b/api/v1/entries/builds.php
new file mode 100644
index 0000000000..fab10bdb4f
--- /dev/null
+++ b/api/v1/entries/builds.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * 禅道API的builds资源类
+ * 版本V1
+ *
+ * The builds entry point of zentaopms
+ * Version 1
+ */
+class buildsEntry extends entry
+{
+    public function get($projectID = 0)
+    {
+        $control = $this->loadController('project', 'build');
+        $control->build($projectID, $this->param('type', 'all'), $this->param('param', 0));
+        $data = $this->getData();
+
+        if(!isset($data->status)) return $this->sendError(400, 'error');
+        if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
+
+        $result = array();
+        foreach($data->data->projectBuilds as $productID => $builds)
+        {
+            foreach($builds as $build)
+            {
+                $result[] = $build;
+            }
+        }
+        return $this->send(200, $result);
+    }
+
+    public function post($projectID = 0)
+    {
+        $project = $this->loadModel('project')->getByID($projectID);
+        if(!$project) return $this->send404();
+
+        $fields = 'type,title,severity,pri,assignedTo,deadline,desc';
+        $this->batchSetPost($fields);
+
+        $control = $this->loadController('build', 'create');
+        $this->requireFields('type,title,severity');
+
+        $control->create($projectID);
+
+        $data = $this->getData();
+        if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
+        if(isset($data->result) and!isset($data->id)) return $this->sendError(400, $data->message);
+
+        $build = $this->loadModel('build')->getByID($data->id);
+
+        $this->send(201, $this->format($build, 'createdDate:time,editedDate:time,assignedDate:time'));
+    }
+}
diff --git a/config/routes.php b/config/routes.php
index eff3b4e5ff..62255b3112 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -51,6 +51,10 @@ $routes['/issues/:issueID']            = 'issue';
 $routes['/todos']     = 'todos';
 $routes['/todos/:id'] = 'todo';
 
+$routes['/projects/:projectID/builds'] = 'builds';
+$routes['/builds']                     = 'builds';
+$routes['/builds/:id']                 = 'build';
+
 $routes['/testcases']     = 'testcases';
 $routes['/testcases/:id'] = 'testcase';
 
diff --git a/module/build/control.php b/module/build/control.php
index 388f30cf5e..2e30fa90cb 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -185,7 +185,11 @@ class build extends control
     {
         $buildID = (int)$buildID;
         $build   = $this->build->getByID($buildID, true);
-        if(!$build) die(js::error($this->lang->notFound) . js::locate('back'));
+        if(!$build)
+        {
+            if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => '404 Not found'));
+            die(js::error($this->lang->notFound) . js::locate('back'));
+        }
         $this->session->project = $build->project;
 
         $this->loadModel('story');

From a580403a3e14d1bf5c8f2b600a87b149bdc36204 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:22:05 +0800
Subject: [PATCH 03/30] * Finish task #42427.

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

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index ec4f1d8346..bd2c3b88bc 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4307,7 +4307,6 @@ class upgradeModel extends model
 
             if(isset($data->projectName) and $data->projectType == 'execution' and empty($data->projectName)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->projectName)));
 
-
             /* Insert program. */
             $program = new stdclass();
             $program->name          = $data->programName;
@@ -4729,6 +4728,8 @@ class upgradeModel extends model
         $today = helper::today();
         foreach($projectTeams as $projectID => $projectMember)
         {
+            if(empty($projectMember)) continue;
+
             $projectMember = array_filter($projectMember);
             $project       = zget($projects, $projectID, '');
             $members       = implode(',', $projectMember);

From bc87c4bd4cff5d578324326ecc838da23276a40f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:25:34 +0800
Subject: [PATCH 04/30] * Finish task #42417.

---
 module/testcase/css/showimport.css       | 1 +
 module/testcase/view/showimport.html.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/testcase/css/showimport.css b/module/testcase/css/showimport.css
index 7a11ac000c..e8af63e74a 100644
--- a/module/testcase/css/showimport.css
+++ b/module/testcase/css/showimport.css
@@ -4,3 +4,4 @@
 .c-story, .c-module, .c-type {width: 120px;}
 .c-stage {width: 160px;}
 .c-step {width: 300px;}
+.form-actions .btn {margin-right: 20px;}
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index d52eb25916..93c3bed4be 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -137,8 +137,8 @@ $(function()
             }
             echo html::hidden('isEndPage', $isEndPage ? 1 : 0);
             echo html::hidden('pagerID', $pagerID);
-            echo ' &nbsp; ' . html::linkButton($lang->goback, $this->inlink('browse', "productID=$productID"), 'self', '', 'btn btn-wide');
-            echo ' &nbsp; ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
+            echo html::linkButton($lang->goback, $this->inlink('browse', "productID=$productID"), 'self', '', 'btn btn-wide');
+            echo sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
             ?>
           </td>
         </tr>

From a409ef22f09252e1d184521340c5f28b31af758c Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:28:13 +0800
Subject: [PATCH 05/30]  * Finish task #42432.

---
 module/doc/view/selectlibtype.html.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/module/doc/view/selectlibtype.html.php b/module/doc/view/selectlibtype.html.php
index 343268b39a..aca2049cc9 100644
--- a/module/doc/view/selectlibtype.html.php
+++ b/module/doc/view/selectlibtype.html.php
@@ -1,3 +1,15 @@
+<?php
+/**
+ * The select lib type view file of doc module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.zentao.net)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@easycorp.ltd>
+ * @package     doc
+ * @version     $Id: selectlibtype.html.php 958 2021-09-3 17:09:42Z liyuchun $
+ * @link        http://www.zentao.net
+ */
+?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -12,11 +24,7 @@
         <td class='w-p85'><?php echo html::radio('objectType', $lang->doc->libTypeList, 'product');?></td>
       </tr>
       <tr>
-        <td colspan='3' class='text-center form-actions'>
-          <?php
-          echo html::submitButton($lang->confirm);
-          ?>
-        </td>
+        <td colspan='3' class='text-center form-actions'><?php echo html::submitButton($lang->confirm);?></td>
       </tr>
     </table>
   </form>

From 0156e986bac32514ab2615fb81678f830830db0b Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:28:42 +0800
Subject: [PATCH 06/30] * show title for lane name in kanban.

---
 www/js/zui/kanban/min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js
index 1abf17e3a3..6956737449 100644
--- a/www/js/zui/kanban/min.js
+++ b/www/js/zui/kanban/min.js
@@ -4,4 +4,4 @@
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2021 cnezsoft.com; Licensed MIT
  */
-!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(d,i){var o=this;o.name=n,o.$=a(d),o.options=i=a.extend({},t.DEFAULTS,this.$.data(),i),o.data=i.data||[],o.render(o.data);var r=function(n){if(i.onAction){var e=a(this);i.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",r).on("dblclick",".action-dbc",r),"auto"===i.droppable&&(i.droppable=!i.readonly),i.droppable){var s={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof i.droppable?i.droppable(a):i.onAction&&i.onAction("dropItem",a.element,a,o)}};"object"==typeof i.droppable&&a.extend(s,i.droppable),o.$.droppable(s)}e&&i.useFlex||a(window).on("resize",function(){o.adjustSize()}),!i.useFlex&&e&&o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",n.options.readonly),n.$.children(".kanban-board").addClass("kanban-expired");for(var d=0;d<t.length;++d)n.renderKanban(d);n.$.children(".kanban-expired").remove(),e&&n.options.useFlex||setTimeout(n.adjustSize.bind(this),200),n.options.onRender&&n.options.onRender(n)},t.prototype.renderKanban=function(n){if("number"==typeof n)n=this.data[n];else{var t=this.data.findIndex(function(a){return a.id===n.id});if(t>-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var i=this,o=i.$,r=o.children('.kanban-board[data-id="'+n.id+'"]');r.length?r.removeClass("kanban-expired"):(r=a('<div class="kanban-board" data-id="'+n.id+'"></div>').appendTo(o),e||r.addClass("no-flex")),i.renderKanbanHeader(n,r),r.children(".kanban-lane").addClass("kanban-expired");for(var s=n.lanes||[],l=0;l<s.length;++l)i.renderLane(s[l],n.columns,r);r.children(".kanban-expired").remove();for(var l=0;l<n.columns.length;++l){var c=n.columns[l].id,p=r.find('.kanban-lane-col[data-id="'+c+'"] > .kanban-lane-items > .kanban-item').length;r.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||"")}i.adjustKanbanSize(n,r),i.options.onRenderKanban&&i.options.onRenderKanban(r,n,i)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var i=t.children(".kanban-header");i.length||(i=a('<div class="kanban-header"></div>').prependTo(t),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,r=0;r<o.length;++r)d.renderHeaderCol(o[r],i);this.options.readonly||d.renderHeaderCol({id:"ADD",kanban:n.id,name:d.options.createColumnText,icon:"plus",type:"ADD"},i),i.children(".kanban-expired").remove()},t.prototype.renderHeaderCol=function(n,e){var t=e.children('.kanban-header-col[data-id="'+n.id+'"]'),d="ADD"===n.id;if(t.length)t.removeClass("kanban-expired"),d&&t.appendTo(e);else{t=a(['<div class="kanban-col kanban-header-col" data-id="'+n.id+'">',"<"+(d?"a":"div")+' class="title">','<i class="icon"></i>','<span class="text"></span>','<span class="count"></span>',"</"+(d?"a":"div")+">","</div>"].join("")).appendTo(e),d?t.children(".title").addClass("action").attr("data-action","addCol"):(t.children(".title").addClass("action-dbc").attr("data-action","editCol"),this.options.readonly||t.append(['<div class="actions">','<button class="btn btn-link action" type="button" data-action="headerMore"><i class="icon icon-more-v"></i></button>',"</div>"].join("")));var i=this.options.minColumnWidth;i&&t.css("min-width",i)}t.data("col",n),t.attr("data-type",n.type),t.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),t.find(".title>.text").text(n.name),t.find(".title>.count").text(n.count||""),this.options.onRenderHeaderCol&&this.options.onRenderHeaderCol(t,n,e)},t.prototype.renderLane=function(n,t,d){var i=this;d=d||i.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=d.children('.kanban-lane[data-id="'+n.id+'"]');o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-lane" data-id="'+n.id+'"></div>').appendTo(d),e||o.addClass("clearfix")),o.data("lane",n);var r=o.children('.kanban-lane-name[data-id="'+n.id+'"]');r.length||(r=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+n.id+'"></div>').appendTo(o));for(var s=[],l=0;l<n.name.length;++l){if(l>15){s.push('<span class="char rotate-90">…</span>');break}s.push('<span class="char">'+n.name[l]+"</span>")}r.toggleClass("is-arab",/^[\da-zA-Z ]+$/.test(n.name)).html('<span class="text">'+s.join("")+"</span>"),n.color&&r.css("background-color",n.color),i.options.onRenderLaneName&&i.options.onRenderLaneName(r,n,d,t),o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),n.subLanes?i.renderSubLanes(n,t,o):i.renderLaneItems(t,n.items,o),i.options.readonly||i.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var d=this,i=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):i=a('<div class="kanban-sub-lanes" data-id="'+n.id+'"></div>').appendTo(t),i.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<n.subLanes.length;++o){var r=n.subLanes[o];d.renderSubLane(r,e,i)}i.children(".kanban-expired").remove()},t.prototype.renderSubLane=function(n,t,d){var i=d.children('.kanban-sub-lane[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):(i=a('<div class="kanban-sub-lane" data-id="'+n.id+'"></div>').appendTo(d),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,i),i.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,d=0;d<a.length;++d){var i=a[d],o=t.renderLaneCol(i,e),r=n[i.type]||[];t.renderColumnItems(i,r,o)}},t.prototype.renderColumnItems=function(a,n,e){var t=e.find(".kanban-lane-items");t.children(".kanban-item").addClass("kanban-expired");for(var d=0;d<n.length;++d){var i=n[d];this.renderLaneItem(i,t,a)}t.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(n,e){var t=this,d=e.children('.kanban-lane-col[data-id="'+n.id+'"]');if(d.length)d.removeClass("kanban-expired");else{d=a('<div class="kanban-col kanban-lane-col" data-id="'+n.id+'"></div>').appendTo(e),"EMPTY"!==n.id&&(d.append('<div class="kanban-lane-items"></div>'),t.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+t.options.addItemText+"</span></button>","</div>"].join("")));var i=t.options;i.minColumnWidth&&d.css("min-width",i.minColumnWidth),i.maxColHeight&&d.find(".kanban-lane-items").css("max-height",i.maxColHeight),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr("data-type",n.type),d},t.prototype.renderLaneItem=function(n,e,t){var d=e.children('.kanban-item[data-id="'+n.id+'"]');if(d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-item" data-id="'+n.id+'"></div>').appendTo(e),this.options.itemRender)this.options.itemRender(n,d,t);else{var i=d.find(".title");i.length||(i=a('<div class="title"></div>').appendTo(d)),i.text(n.name||n.title)}return d},t.prototype.adjustKanbanSize=function(n,t){var d=this,i=d.options.laneNameWidth,o=n.columns.length+(d.options.readonly?0:1),r=d.options.minColumnWidth*o+i;if(t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]'),t.css({minWidth:r}),!d.options.useFlex||!e){var s=Math.max(r,d.$.width()),l=Math.floor((s-i)/o);t.find(".kanban-col").css("width",l),t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col").css("height",e)})}},t.prototype.adjustSize=function(){for(var a=0;a<this.data.length;++a)this.adjustKanbanSize(this.data[a])},t.DEFAULTS={minColumnWidth:100,maxColHeight:400,laneNameWidth:20,addItemText:"添加条目",createColumnText:"添加看板列",useFlex:!0,itemRender:null,droppable:"auto",readonly:!1,laneColClass:""},a.fn.kanban=function(e){return this.each(function(){var d=a(this),i=d.data(n),o="object"==typeof e&&e;i||d.data(n,i=new t(this,o)),"string"==typeof e&&i[e]()})},t.NAME=n,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file
+!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(d,i){var o=this;o.name=n,o.$=a(d),o.options=i=a.extend({},t.DEFAULTS,this.$.data(),i),o.data=i.data||[],o.render(o.data);var r=function(n){if(i.onAction){var e=a(this);i.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",r).on("dblclick",".action-dbc",r),"auto"===i.droppable&&(i.droppable=!i.readonly),i.droppable){var s={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof i.droppable?i.droppable(a):i.onAction&&i.onAction("dropItem",a.element,a,o)}};"object"==typeof i.droppable&&a.extend(s,i.droppable),o.$.droppable(s)}e&&i.useFlex||a(window).on("resize",function(){o.adjustSize()}),!i.useFlex&&e&&o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",n.options.readonly),n.$.children(".kanban-board").addClass("kanban-expired");for(var d=0;d<t.length;++d)n.renderKanban(d);n.$.children(".kanban-expired").remove(),e&&n.options.useFlex||setTimeout(n.adjustSize.bind(this),200),n.options.onRender&&n.options.onRender(n)},t.prototype.renderKanban=function(n){if("number"==typeof n)n=this.data[n];else{var t=this.data.findIndex(function(a){return a.id===n.id});if(t>-1){var d=this.data[t];n=a.extend(d,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var i=this,o=i.$,r=o.children('.kanban-board[data-id="'+n.id+'"]');r.length?r.removeClass("kanban-expired"):(r=a('<div class="kanban-board" data-id="'+n.id+'"></div>').appendTo(o),e||r.addClass("no-flex")),i.renderKanbanHeader(n,r),r.children(".kanban-lane").addClass("kanban-expired");for(var s=n.lanes||[],l=0;l<s.length;++l)i.renderLane(s[l],n.columns,r);r.children(".kanban-expired").remove();for(var l=0;l<n.columns.length;++l){var c=n.columns[l].id,p=r.find('.kanban-lane-col[data-id="'+c+'"] > .kanban-lane-items > .kanban-item').length;r.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||"")}i.adjustKanbanSize(n,r),i.options.onRenderKanban&&i.options.onRenderKanban(r,n,i)},t.prototype.renderKanbanHeader=function(n,t){var d=this;t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]');var i=t.children(".kanban-header");i.length||(i=a('<div class="kanban-header"></div>').prependTo(t),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,r=0;r<o.length;++r)d.renderHeaderCol(o[r],i);this.options.readonly||d.renderHeaderCol({id:"ADD",kanban:n.id,name:d.options.createColumnText,icon:"plus",type:"ADD"},i),i.children(".kanban-expired").remove()},t.prototype.renderHeaderCol=function(n,e){var t=e.children('.kanban-header-col[data-id="'+n.id+'"]'),d="ADD"===n.id;if(t.length)t.removeClass("kanban-expired"),d&&t.appendTo(e);else{t=a(['<div class="kanban-col kanban-header-col" data-id="'+n.id+'">',"<"+(d?"a":"div")+' class="title">','<i class="icon"></i>','<span class="text"></span>','<span class="count"></span>',"</"+(d?"a":"div")+">","</div>"].join("")).appendTo(e),d?t.children(".title").addClass("action").attr("data-action","addCol"):(t.children(".title").addClass("action-dbc").attr("data-action","editCol"),this.options.readonly||t.append(['<div class="actions">','<button class="btn btn-link action" type="button" data-action="headerMore"><i class="icon icon-more-v"></i></button>',"</div>"].join("")));var i=this.options.minColumnWidth;i&&t.css("min-width",i)}t.data("col",n),t.attr("data-type",n.type),t.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),t.find(".title>.text").text(n.name),t.find(".title>.count").text(n.count||""),this.options.onRenderHeaderCol&&this.options.onRenderHeaderCol(t,n,e)},t.prototype.renderLane=function(n,t,d){var i=this;d=d||i.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=d.children('.kanban-lane[data-id="'+n.id+'"]');o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-lane" data-id="'+n.id+'"></div>').appendTo(d),e||o.addClass("clearfix")),o.data("lane",n);var r=o.children('.kanban-lane-name[data-id="'+n.id+'"]');r.length||(r=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+n.id+'"></div>').appendTo(o));for(var s=[],l=0;l<n.name.length;++l){if(l>15){s.push('<span class="char rotate-90">…</span>');break}s.push('<span class="char">'+n.name[l]+"</span>")}r.toggleClass("is-arab",/^[\da-zA-Z ]+$/.test(n.name)).attr("title",n.name).html('<span class="text">'+s.join("")+"</span>"),n.color&&r.css("background-color",n.color),i.options.onRenderLaneName&&i.options.onRenderLaneName(r,n,d,t),o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),n.subLanes?i.renderSubLanes(n,t,o):i.renderLaneItems(t,n.items,o),i.options.readonly||i.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var d=this,i=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):i=a('<div class="kanban-sub-lanes" data-id="'+n.id+'"></div>').appendTo(t),i.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<n.subLanes.length;++o){var r=n.subLanes[o];d.renderSubLane(r,e,i)}i.children(".kanban-expired").remove()},t.prototype.renderSubLane=function(n,t,d){var i=d.children('.kanban-sub-lane[data-id="'+n.id+'"]');i.length?i.removeClass("kanban-expired"):(i=a('<div class="kanban-sub-lane" data-id="'+n.id+'"></div>').appendTo(d),e||i.addClass("clearfix")),i.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,i),i.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,d=0;d<a.length;++d){var i=a[d],o=t.renderLaneCol(i,e),r=n[i.type]||[];t.renderColumnItems(i,r,o)}},t.prototype.renderColumnItems=function(a,n,e){var t=e.find(".kanban-lane-items");t.children(".kanban-item").addClass("kanban-expired");for(var d=0;d<n.length;++d){var i=n[d];this.renderLaneItem(i,t,a)}t.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(n,e){var t=this,d=e.children('.kanban-lane-col[data-id="'+n.id+'"]');if(d.length)d.removeClass("kanban-expired");else{d=a('<div class="kanban-col kanban-lane-col" data-id="'+n.id+'"></div>').appendTo(e),"EMPTY"!==n.id&&(d.append('<div class="kanban-lane-items"></div>'),t.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+t.options.addItemText+"</span></button>","</div>"].join("")));var i=t.options;i.minColumnWidth&&d.css("min-width",i.minColumnWidth),i.maxColHeight&&d.find(".kanban-lane-items").css("max-height",i.maxColHeight),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)}return"EMPTY"===n.id&&d.appendTo(e),d.attr("data-type",n.type),d},t.prototype.renderLaneItem=function(n,e,t){var d=e.children('.kanban-item[data-id="'+n.id+'"]');if(d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-item" data-id="'+n.id+'"></div>').appendTo(e),this.options.itemRender)this.options.itemRender(n,d,t);else{var i=d.find(".title");i.length||(i=a('<div class="title"></div>').appendTo(d)),i.text(n.name||n.title)}return d},t.prototype.adjustKanbanSize=function(n,t){var d=this,i=d.options.laneNameWidth,o=n.columns.length+(d.options.readonly?0:1),r=d.options.minColumnWidth*o+i;if(t=t||d.$.children('.kanban-board[data-id="'+n.id+'"]'),t.css({minWidth:r}),!d.options.useFlex||!e){var s=Math.max(r,d.$.width()),l=Math.floor((s-i)/o);t.find(".kanban-col").css("width",l),t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col").css("height",e)})}},t.prototype.adjustSize=function(){for(var a=0;a<this.data.length;++a)this.adjustKanbanSize(this.data[a])},t.DEFAULTS={minColumnWidth:100,maxColHeight:400,laneNameWidth:20,addItemText:"添加条目",createColumnText:"添加看板列",useFlex:!0,itemRender:null,droppable:"auto",readonly:!1,laneColClass:""},a.fn.kanban=function(e){return this.each(function(){var d=a(this),i=d.data(n),o="object"==typeof e&&e;i||d.data(n,i=new t(this,o)),"string"==typeof e&&i[e]()})},t.NAME=n,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file

From 36198e0b2df425ad2c6103cc8b74a0caaec58f60 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 11:28:55 +0800
Subject: [PATCH 07/30] * fix affix not work as expected in kanban.

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

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 2dfc042a9a..efbd8ec9e9 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -320,7 +320,7 @@ function updateKanbanAffixState()
     {
         var $board = $(this);
         var offsetTop = $board.offset().top;
-        if(scrollTop >= offsetTop && offsetTop > currentOffsetTop && scrollTop < (offsetTop + $board.outerHeight()))
+        if(scrollTop >= offsetTop && offsetTop > currentOffsetTop && scrollTop < (offsetTop + $board.outerHeight() - 72))
         {
             currentOffsetTop = offsetTop;
             $currentAffixedBoard = $board;

From cce8dff395c841851295d132770336421cd904b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 11:31:37 +0800
Subject: [PATCH 08/30]  * finish task #42433.

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

diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js
index 9017c3682f..f9fca2bb2b 100644
--- a/module/execution/js/batchedit.js
+++ b/module/execution/js/batchedit.js
@@ -2,8 +2,8 @@ $(function()
 {
     $('[id^="projects"]').change(function()
     {
-        executionID = $(this).attr('id').replace('projects', '');
-        $td = $(this).closest('td');
+        var executionID = $(this).attr('id').replace('projects', '');
+        var $td = $(this).closest('td');
         if($td.find('[id^="syncStories"]').length == 0)
         {
             $td.append("<input type='hidden' id='syncStories" + executionID + "' name='syncStories[" + executionID + "]' value='no' />");

From c0bcc61b1ef3f14287679b47939c2294f8bd766a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 11:33:25 +0800
Subject: [PATCH 09/30]  * finish task #42422.

---
 module/todo/js/view.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index 99e55939d1..a27da6f0cc 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -21,7 +21,6 @@ $(function()
             return false;
         }
         var onlybody  = config.onlybody == 'yes';
-        var projectID = $('#project').val();
         var link      = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=' + todoID, config.defaultView, onlybody);
 
         location.href = link;
@@ -30,7 +29,6 @@ $(function()
     $('#toStoryButton').click(function()
     {
         var onlybody  = config.onlybody == 'yes';
-        var programID = $('#productProgram').val();
         var productID = $('#product').val();
         var link      = createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID=' + todoID, config.defaultView, onlybody);
 
@@ -40,7 +38,6 @@ $(function()
     $('#toBugButton').click(function()
     {
         var onlybody  = config.onlybody == 'yes';
-        var projectID = $('#bugProject').val();
         var productID = $('#bugProduct').val();
         var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
 

From 0d764a7ce0ba77df3fcefcfaaa6a491ad092d976 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:04:21 +0800
Subject: [PATCH 10/30]  * Finish task #42430.

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

diff --git a/module/webhook/model.php b/module/webhook/model.php
index 37393c3754..54852bf529 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -596,7 +596,7 @@ class webhookModel extends model
             $toList = implode(',', $toList);
         }
 
-        $toList = str_replace(",{$this->app->user->account},", ' ', ",$toList,");
+        $toList = str_replace(",{$this->app->user->account},", ',', ",$toList,");
 
         $openIdList = $this->getBoundUsers($webhookID, $toList);
         $openIdList = join(',', $openIdList);

From 26ee9677ce1072ce653091ee49ef319343d9b069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:04:27 +0800
Subject: [PATCH 11/30]  * finish task #42394.

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

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 00f18b2638..730b949045 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -91,7 +91,6 @@ class productplanModel extends model
 
         if(!empty($plans))
         {
-
             $plans      = $this->reorder4Children($plans);
             $planIdList = array_keys($plans);
 

From 5c2a1acab7819bf92437098ec49417520c6dfa4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:05:47 +0800
Subject: [PATCH 12/30]  * finish task #42381.

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

diff --git a/module/doc/model.php b/module/doc/model.php
index c25818e4f6..ba6bee9694 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1159,11 +1159,7 @@ class docModel extends model
                 ->where('deleted')->eq(0)
                 ->andWhere($type)->eq($objectID)
                 ->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi()
-                ->beginIF($type == 'project')
-                ->andWhere('(execution')->eq(0)
-                ->orWhere('main')->eq(0)
-                ->markRight(1)
-                ->fi()
+                ->beginIF($type == 'project')->andWhere('execution')->eq(0)->fi()
                 ->orderBy('`order`, id')
                 ->fetchAll('id');
         }

From 84c31791799ddb229d337328f29b633a0fb3e14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:07:59 +0800
Subject: [PATCH 13/30]  * finish task #42372.

---
 framework/base/control.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 4a20b7cd9e..086d748364 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -897,6 +897,7 @@ class baseControl
             foreach($data as $key => $value)
             {
                 if(!is_string($value)) continue;
+
                 /* Retain ["] for json encode when value is jsoned string. */
                 $data[$key] = str_replace('%22', '"', urlencode($value));
             }

From efa385717c09e1a107a537e38d15cb9402d71ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:09:37 +0800
Subject: [PATCH 14/30]  * finish task #42373.

---
 framework/router.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index d482fd3889..a0f38fe93d 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -160,7 +160,8 @@ class router extends baseRouter
             }
         }
 
-        $hourKey    = $planKey = $URSR = $URAndSR = 0;
+        $hourKey = $planKey = $URSR = $URAndSR = 0;
+
         $mode       = 'new';
         $score      = '0';
         $projectKey = empty($this->config->isINT) ? ITERATION_KEY : SPRINT_KEY;

From 54661ec8132b44b1a9ab7d18df40a9cb2d71f4dd Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:12:19 +0800
Subject: [PATCH 15/30]  * Finish task #42414.

---
 module/task/css/batchcreate.css       | 4 +++-
 module/task/view/batchcreate.html.php | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index 77630ddbbd..c9998a61a5 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -21,6 +21,8 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;}
 .chosen-results > li.has-new-task.highlighted {color: #fff;}
 
 .c-id {width: 30px;}
-.c-module {width: 150px;}
+.c-module, .c-desc {width: 150px;}
 .c-story {width: 200px;}
 .c-assigned {width: 130px;}
+.c-date {width: 120px;}
+.c-pri {width: 80px;}
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index dd91695c77..d8ff99104d 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -68,10 +68,10 @@
             <th class='c-type required'><?php echo $lang->typeAB;?></span></th>
             <th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
             <th class='c-estimate<?php  echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
-            <th class='c-full-date<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline',   '', ' required');?>'><?php echo $lang->task->deadline;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->task->desc;?></th>
-            <th class='w-80px<?php  echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
+            <th class='c-date<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted;?></th>
+            <th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline',   '', ' required');?>'><?php echo $lang->task->deadline;?></th>
+            <th class='c-desc<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->task->desc;?></th>
+            <th class='c-pri<?php  echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
             <?php
             $extendFields = $this->task->getFlowExtendFields();
             foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";

From 64c100dd058aee47eaf1c4399dcde1dd2b6fcbe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:15:30 +0800
Subject: [PATCH 16/30]  * finish task #42397.

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

diff --git a/module/program/model.php b/module/program/model.php
index 6f1dff86a1..6b8bb8f347 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -914,7 +914,7 @@ class programModel extends model
     }
 
     /**
-     * get top program by path.
+     * Get top program by path.
      *
      * @param  string  $path
      * @access public

From a265e45b8a390da168f2cce5b2a654b91a97d444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:16:38 +0800
Subject: [PATCH 17/30]  * finish task #42398.

---
 module/project/css/browse.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/css/browse.css b/module/project/css/browse.css
index 450518eb5e..c89de26fc7 100644
--- a/module/project/css/browse.css
+++ b/module/project/css/browse.css
@@ -4,7 +4,7 @@
 
 th.c-budget {text-align: right;}
 td.c-actions {overflow: visible;}
-td.c-PM{white-space: nowrap;overflow: hidden;}
+td.c-PM {white-space: nowrap; overflow: hidden;}
 .c-actions .btn {overflow: visible;}
 #programBox {float: left; margin-right: 10px; width: 170px !important;}
 #switchButton {background: #fff !important;}

From 5ae8a3ff2dd29aa33989dab037276aacba6e6252 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:18:42 +0800
Subject: [PATCH 18/30]  * Finish task #42410.

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

diff --git a/module/story/model.php b/module/story/model.php
index 1b4e868659..f8a7069df9 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2572,8 +2572,8 @@ class storyModel extends model
                 ->beginIF($type == 'bybranch' and strpos($branchID, ',') !== false)->andWhere('t2.branch')->eq($branchParam)->fi()
                 ->beginIF(strpos('changed|closed', $type) !== false)->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
-                ->beginIF($type == 'linkedexecution')->andWhere('t2.id')->in(array_keys($storyIdList))->fi()
-                ->beginIF($type == 'unlinkedexecution')->andWhere('t2.id')->notIn(array_keys($storyIdList))->fi()
+                ->beginIF($type == 'linkedexecution')->andWhere('t2.id')->in($storyIdList)->fi()
+                ->beginIF($type == 'unlinkedexecution')->andWhere('t2.id')->notIn($storyIdList)->fi()
                 ->fi()
                 ->beginIF($execution->type != 'project')
                 ->beginIF(!empty($productParam))->andWhere('t1.product')->eq($productParam)->fi()
@@ -2631,8 +2631,8 @@ class storyModel extends model
             ->beginIF($status == 'unclosed')->andWhere('t2.status')->ne('closed')->fi()
             ->orderBy('t1.`order` desc')
             ->fetchAll();
-        if(empty($stories)) return array();
-        return $this->formatStories($stories, $type);
+
+        return empty($stories) ? array() : $this->formatStories($stories, $type);
     }
 
     /**

From b70ef8e1c0a0eb5d23dd312c44b220ce30ea8bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:19:16 +0800
Subject: [PATCH 19/30]  * finish task #42424.

---
 module/tutorial/lang/en.php    | 83 ++++++++++++++--------------------
 module/tutorial/lang/zh-cn.php | 76 ++++++++++++-------------------
 2 files changed, 63 insertions(+), 96 deletions(-)

diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 021fa6e783..75ddf25769 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -45,62 +45,45 @@ $lang->tutorial->tasks['createProgram']['mode'] = 'new';
 $lang->tutorial->tasks['createProgram']['nav']  = array('app' => 'program', 'module' => 'program', 'method' => 'create', 'menuModule' => 'program', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="browse"],.create-program-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-program-btn', 'targetPageName' => 'Create program');
 $lang->tutorial->tasks['createProgram']['desc'] = "<p>Create a new program：</p><ul><li data-target='nav'>Open <span class='task-nav'>Program <i class='icon icon-angle-right'></i> Program list <i class='icon icon-angle-right'></i> Create program</span>;</li><li data-target='form'>Fill the form with program information;</li><li data-target='submit'>Save</li></ul>";
 
-global $config;
-if($config->global->flow == 'full' or $config->global->flow != 'onlyTask')
-{
-    $lang->tutorial->tasks['createProduct']         = array('title' => 'Create a ' . $lang->productCommon);
-    $lang->tutorial->tasks['createProduct']['nav']  = array('app' => 'product', 'module' => 'product', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'all', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->productCommon);
-    $lang->tutorial->tasks['createProduct']['desc'] = "<p>Create a {$lang->productCommon}: </p><ul><li data-target='nav'> Open <span class='task-nav'>{$lang->productCommon} list <i class='icon icon-angle-right'></i> {$lang->productCommon} <i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with {$lang->productCommon} information;</li><li data-target='submit'>Save</li></ul>";
-}
+$lang->tutorial->tasks['createProduct']         = array('title' => 'Create a ' . $lang->productCommon);
+$lang->tutorial->tasks['createProduct']['nav']  = array('app' => 'product', 'module' => 'product', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'all', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => $lang->productCommon);
+$lang->tutorial->tasks['createProduct']['desc'] = "<p>Create a {$lang->productCommon}: </p><ul><li data-target='nav'> Open <span class='task-nav'>{$lang->productCommon} list <i class='icon icon-angle-right'></i> {$lang->productCommon} <i class='icon icon-angle-right'></i> New;</span></li><li data-target='form'>Fill the form with {$lang->productCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
-{
-    $lang->tutorial->tasks['createStory']         = array('title' => "Create a {$lang->SRCommon}");
-    $lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "Create {$lang->SRCommon}");
-    $lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
-}
+$lang->tutorial->tasks['createStory']         = array('title' => "Create a {$lang->SRCommon}");
+$lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "Create {$lang->SRCommon}");
+$lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
-{
-    $lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
-    $lang->tutorial->tasks['createProject']['mode'] = 'new';
-    $lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
+$lang->tutorial->tasks['createProject']['mode'] = 'new';
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-    $lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
-    $lang->tutorial->tasks['manageTeam']['mode'] = 'new';
-    $lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
+$lang->tutorial->tasks['manageTeam']['mode'] = 'new';
+$lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
-    $lang->tutorial->tasks['createExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
-    $lang->tutorial->tasks['createExecution']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create ' . $lang->executionCommon);
-    $lang->tutorial->tasks['createExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
+$lang->tutorial->tasks['createExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
+$lang->tutorial->tasks['createExecution']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create ' . $lang->executionCommon);
+$lang->tutorial->tasks['createExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
 
-    $lang->tutorial->tasks['manageExecutionTeam']         = array('title' => "Manage {$lang->executionCommon} Team");
-    $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
-    $lang->tutorial->tasks['manageExecutionTeam']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-    $lang->tutorial->tasks['manageExecutionTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageExecutionTeam']         = array('title' => "Manage {$lang->executionCommon} Team");
+$lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
+$lang->tutorial->tasks['manageExecutionTeam']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
+$lang->tutorial->tasks['manageExecutionTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
+$lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
+$lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "Link {$lang->SRCommon}");
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
 
-    if($config->global->flow == 'full')
-    {
-        $lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
-        $lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "Link {$lang->SRCommon}");
-        $lang->tutorial->tasks['linkStory']['desc'] = "<p>Link a Story to {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i>Relate Story;</span></li><li data-target='form'>Select stories from story list to relate;</li><li data-target='submit'>Save</li></ul>";
-    }
+$lang->tutorial->tasks['createTask']         = array('title' => 'Task Breakdown');
+$lang->tutorial->tasks['createTask']['nav']  = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
+$lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
 
-    $lang->tutorial->tasks['createTask']         = array('title' => 'Task Breakdown');
-    $lang->tutorial->tasks['createTask']['nav']  = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task');
-    $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Story <i class='icon icon-angle-right'></i> WBS;</span></li><li data-target='form'>Fill the form with task information;</li><li data-target='submit'>Save</li></ul>";
-}
+$lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
+$lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
+$lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
-{
-    $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
-    $lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
-    $lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
-
-    $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
-    $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
-    $lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> QA <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
-}
+$lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
+$lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
+$lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> QA <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index e14455e810..860116503a 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -44,57 +44,41 @@ $lang->tutorial->tasks['createProgram']['mode'] = 'new';
 $lang->tutorial->tasks['createProgram']['nav']  = array('app' => 'program', 'module' => 'program', 'method' => 'create', 'menuModule' => 'program', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="browse"],.create-program-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-program-btn', 'targetPageName' => '添加项目集');
 $lang->tutorial->tasks['createProgram']['desc'] = "<p>在系统创建一个新的项目集：</p><ul><li data-target='nav'>打开 <span class='task-nav'>项目集 <i class='icon icon-angle-right'></i> 项目集列表 <i class='icon icon-angle-right'></i> 添加项目集</span> 页面；</li><li data-target='form'>在添加项目集表单中填写项目集信息；</li><li data-target='submit'>保存项目集信息。</li></ul>";
 
-global $config;
-if($config->global->flow == 'full' or $config->global->flow != 'onlyTask')
-{
-    $lang->tutorial->tasks['createProduct']         = array('title' => '创建' . $lang->productCommon);
-    $lang->tutorial->tasks['createProduct']['nav']  = array('app' => 'product', 'module' => 'product', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'all', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加' . $lang->productCommon);
-    $lang->tutorial->tasks['createProduct']['desc'] = "<p>在系统创建一个新的{$lang->productCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->productCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->productCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->productCommon}信息；</li><li data-target='submit'>保存{$lang->productCommon}信息。</li></ul>";
-}
+$lang->tutorial->tasks['createProduct']         = array('title' => '创建' . $lang->productCommon);
+$lang->tutorial->tasks['createProduct']['nav']  = array('app' => 'product', 'module' => 'product', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'all', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加' . $lang->productCommon);
+$lang->tutorial->tasks['createProduct']['desc'] = "<p>在系统创建一个新的{$lang->productCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->productCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->productCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->productCommon}信息；</li><li data-target='submit'>保存{$lang->productCommon}信息。</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyStory')
-{
-    $lang->tutorial->tasks['createStory']         = array('title' => "创建{$lang->SRCommon}");
-    $lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->SRCommon}");
-    $lang->tutorial->tasks['createStory']['desc'] = "<p>在系统创建一个新的{$lang->SRCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 提{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->SRCommon}信息；</li><li data-target='submit'>保存{$lang->SRCommon}信息。</li></ul>";
-}
+$lang->tutorial->tasks['createStory']         = array('title' => "创建{$lang->SRCommon}");
+$lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->SRCommon}");
+$lang->tutorial->tasks['createStory']['desc'] = "<p>在系统创建一个新的{$lang->SRCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 提{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->SRCommon}信息；</li><li data-target='submit'>保存{$lang->SRCommon}信息。</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
-{
-    $lang->tutorial->tasks['createProject']         = array('title' => '创建' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['mode'] = 'new';
-    $lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
-    $lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->projectCommon}列表 <i class='icon icon-angle-right'></i> 创建{$lang->projectCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => '创建' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['mode'] = 'new';
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->projectCommon}列表 <i class='icon icon-angle-right'></i> 创建{$lang->projectCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
 
-    $lang->tutorial->tasks['manageTeam']         = array('title' => "管理{$lang->projectCommon}团队");
-    $lang->tutorial->tasks['manageTeam']['mode'] = 'new';
-    $lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '团队管理');
-    $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
+$lang->tutorial->tasks['manageTeam']         = array('title' => "管理{$lang->projectCommon}团队");
+$lang->tutorial->tasks['manageTeam']['mode'] = 'new';
+$lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '团队管理');
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
 
-    $lang->tutorial->tasks['createExecution']         = array('title' => '创建' . $lang->executionCommon);
-    $lang->tutorial->tasks['createExecution']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon);
-    $lang->tutorial->tasks['createExecution']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createExecution']         = array('title' => '创建' . $lang->executionCommon);
+$lang->tutorial->tasks['createExecution']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon);
+$lang->tutorial->tasks['createExecution']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon}列表 <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
 
-    $lang->tutorial->tasks['manageExecutionTeam']         = array('title' => "管理{$lang->executionCommon}团队");
-    $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
-    $lang->tutorial->tasks['manageExecutionTeam']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理');
-    $lang->tutorial->tasks['manageExecutionTeam']['desc'] = "<p>管理{$lang->executionCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
+$lang->tutorial->tasks['manageExecutionTeam']         = array('title' => "管理{$lang->executionCommon}团队");
+$lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
+$lang->tutorial->tasks['manageExecutionTeam']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理');
+$lang->tutorial->tasks['manageExecutionTeam']['desc'] = "<p>管理{$lang->executionCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
 
-    if($config->global->flow == 'full')
-    {
-        $lang->tutorial->tasks['linkStory']         = array('title' => "关联{$lang->SRCommon}");
-        $lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}");
-        $lang->tutorial->tasks['linkStory']['desc'] = "<p>将{$lang->SRCommon}关联到{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在{$lang->SRCommon}列表中勾选要关联的{$lang->SRCommon}；</li><li data-target='submit'>保存关联的{$lang->SRCommon}信息。</li></ul>";
-    }
+$lang->tutorial->tasks['linkStory']         = array('title' => "关联{$lang->SRCommon}");
+$lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}");
+$lang->tutorial->tasks['linkStory']['desc'] = "<p>将{$lang->SRCommon}关联到{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 关联{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在{$lang->SRCommon}列表中勾选要关联的{$lang->SRCommon}；</li><li data-target='submit'>保存关联的{$lang->SRCommon}信息。</li></ul>";
 
-    $lang->tutorial->tasks['createTask']         = array('title' => '分解任务');
-    $lang->tutorial->tasks['createTask']['nav']  = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务');
-    $lang->tutorial->tasks['createTask']['desc'] = "<p>将{$lang->executionCommon}{$lang->SRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
-}
+$lang->tutorial->tasks['createTask']         = array('title' => '分解任务');
+$lang->tutorial->tasks['createTask']['nav']  = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务');
+$lang->tutorial->tasks['createTask']['desc'] = "<p>将{$lang->executionCommon}{$lang->SRCommon}分解为任务：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 分解任务</span> 页面；</li><li data-target='form'>在表单中填写任务信息；</li><li data-target='submit'>保存任务信息。</li></ul>";
 
-if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
-{
-    $lang->tutorial->tasks['createBug']         = array('title' => '提Bug');
-    $lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
-    $lang->tutorial->tasks['createBug']['desc'] = "<p>在系统中提交一个Bug：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 测试 <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> 提Bug</span>；</li><li data-target='form'>在表单中填写Bug信息；</li><li data-target='submit'>保存Bug信息。</li></ul>";
-}
+$lang->tutorial->tasks['createBug']         = array('title' => '提Bug');
+$lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
+$lang->tutorial->tasks['createBug']['desc'] = "<p>在系统中提交一个Bug：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 测试 <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> 提Bug</span>；</li><li data-target='form'>在表单中填写Bug信息；</li><li data-target='submit'>保存Bug信息。</li></ul>";

From cc1e8a8b3234eb5ddec9de3ac810cc7517a0a587 Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:19:44 +0800
Subject: [PATCH 20/30] * bug #14738, fix tootip not show as expected in menu
 nav.

---
 module/index/view/index.html.php |  7 +++++++
 module/tutorial/js/index.js      | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index a7d36a5555..bd5ddc5019 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -30,6 +30,13 @@ js::set('manualUrl',     ((!empty($config->isINT)) ? $config->manualUrl['int'] :
 #upgradeContent {top: -272px; height: 262px;}
 #latestVersionList {height: 200px;}
 <?php endif;?>
+
+<?php if(commonModel::isTutorialMode()):?>
+#menuMoreNav > li.dropdown:hover + .tooltip {display: none!important;}
+#menuMoreList > li.active {position: relative;}
+#menuMoreList > li.active:before {content: ' '; display: block; position: absolute; left: 100%; border-width: 5px 5px 5px 0; border-style: solid; border-color: transparent; border-right-color: #ff9800; width: 0; height: 0; top: 12px}
+#menuMoreList > li.active:after {content: attr(data-tip); display: block; position: absolute; left: 100%; background-color: #f1a325; color: #fff; top: 3px; white-space: nowrap; line-height: 16px; padding: 8px 10px; margin-left: 5px; border-radius: 4px;}
+<?php endif;?>
 </style>
 <div id='menu'>
   <nav id='menuNav'>
diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js
index 52668ec8d5..370bec15ff 100644
--- a/module/tutorial/js/index.js
+++ b/module/tutorial/js/index.js
@@ -81,8 +81,7 @@ $(function()
 
     var clearTips = function()
     {
-        appsWindow.$('#menuMainNav > li.hl-tutorial').removeClass('hl-tutorial hl-in').tooltip('destroy');
-        var $menuMainNav = appsWindow.$('#menuMainNav');
+        var $menuMainNav = appsWindow.$('#menuNav');
         $menuMainNav.find('.hl-tutorial').removeClass('hl-tutorial hl-in');
         $menuMainNav.find('.tooltip-tutorial').tooltip('destroy').removeClass('tooltip-tutorial');
         var appWindow = getAppWindow();
@@ -178,16 +177,25 @@ $(function()
             html: true
         }, options);
         $e = $e.first();
-        if($e.css('display') == 'none')
-        {
-            $e.parent().addClass('tooltip-tutorial').after("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
-        }
-        else
+        if($e.css('display') !== 'none')
         {
             if(!$e.data('zui.tooltip')) $e.addClass('tooltip-tutorial').attr('data-toggle', 'tooltip').tooltip(options);
             $e.tooltip('show');
             if($e[0].getBoundingClientRect().top > $(window).height() || $e[0].getBoundingClientRect().top < 0) $e[0].scrollIntoView();
         }
+        else if($e.parent().is('#menuMainNav'))
+        {
+            var $menuMoreItem = appsWindow.$('#menuMoreNav>li.dropdown');
+            highlight($menuMoreItem);
+            showToolTip($menuMoreItem, text, $.extend({}, options, {tipClass: 'tooltip-warning tooltip-max tooltip-menu-more text-nowrap', container: false}));
+            var appCode = $e.data('app');
+            appsWindow.$('#menuMoreList>li').removeClass('active').attr('data-tip', '');
+            appsWindow.$('#menuMoreList>li[data-app="' + appCode + '"]').addClass('active hl-tutorial hl-in').attr('data-tip', text);
+        }
+        else
+        {
+            $e.parent().addClass('tooltip-tutorial').after("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
+        }
     };
 
     var tryCheckTask = function()

From c427beb6f9208cca59874efacf46d4171135476e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:20:40 +0800
Subject: [PATCH 21/30]  * finish task #42425.

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

diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php
index c69d510e94..454c6edcf4 100644
--- a/module/tutorial/view/index.html.php
+++ b/module/tutorial/view/index.html.php
@@ -78,7 +78,7 @@
         $nav = $task['nav'];
         if(!commonModel::hasPriv($nav['module'], $nav['method'])) continue;
         $task['name'] = $name;
-        $task['id']   = ++$idx;
+        $task['id']   = ++ $idx;
         $task['url']  = helper::createLink($nav['module'], $nav['method'], isset($nav['vars']) ? $nav['vars'] : '', 'tutorial');
         $tasks[$name] = $task;
         ?>

From 09ce55e8a65cffda1e4ace7e1d2897432802470c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:21:46 +0800
Subject: [PATCH 22/30]  * finish task #42426.

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

diff --git a/module/tutorial/control.php b/module/tutorial/control.php
index 1d938ee6ba..91e1e8dde3 100644
--- a/module/tutorial/control.php
+++ b/module/tutorial/control.php
@@ -109,7 +109,7 @@ class tutorial extends control
         $moduleLower = strtolower($module);
         foreach($this->lang->tutorial->tasks as $task)
         {
-            $taskModule = strtolower($task['nav']['module']);
+            $taskModule     = strtolower($task['nav']['module']);
             $taskMenuModule = strtolower($task['nav']['menuModule']);
             if($taskModule == $moduleLower or $taskMenuModule == $moduleLower)
             {

From f3a07d930a0aee9f24da7095fec75f451053b2b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:24:37 +0800
Subject: [PATCH 23/30]  * finish task #42428.

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

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index bd2c3b88bc..c1fbec195d 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5288,7 +5288,7 @@ class upgradeModel extends model
     }
 
     /**
-     * Required to adjust the bug.
+     * Adjust for bug required field.
      *
      * @access public
      * @return void
@@ -5304,6 +5304,6 @@ class upgradeModel extends model
 
         $data->value = ',' . $data->value . ',';
         $data->value = str_replace(',project,', ',', $data->value);
-        $this->dao->update(TABLE_CONFIG)->set('value')->eq(trim($data->value, ','))->where('id')->eq($data->id)->exec();
+        $this->dao->update(TABLE_CONFIG)->set('`value`')->eq(trim($data->value, ','))->where('id')->eq($data->id)->exec();
     }
 }

From 6cb052396fe84ff9f7f7f92e864f16be51a6d6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:25:37 +0800
Subject: [PATCH 24/30]  * finish task #42429.

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

diff --git a/module/user/config.php b/module/user/config.php
index bd1a602d98..3a5dc35dc1 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -18,5 +18,5 @@ $config->user->failTimes    = 6;
 $config->user->lockMinutes  = 10;
 $config->user->batchCreate  = 10;
 
-/* user detail fields for API against JIHU GitLab. */
+/* User detail fields for API against JIHU GitLab. */
 $config->user->detailFields = 'id,account,realname,avatar';

From 5def99b75f5fd11ef39a603b64a3681ed29ba0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:28:28 +0800
Subject: [PATCH 25/30]  * adjust for notes.

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

diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 8d9e2f4828..a5ff3994b1 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -70,7 +70,7 @@ class gitlabModel extends model
      *
      * @param  int    $gitlabID
      * @access public
-     * @return void
+     * @return array
      */
     public function getUserIdRealnamePairs($gitlabID)
     {

From ea12eaf5f88c0a89451b140848e78adc662f674c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:34:21 +0800
Subject: [PATCH 26/30] * Finish task #42396.

---
 module/program/control.php |  6 +++
 module/program/model.php   | 81 ++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index f07b8c2e63..261669925d 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -67,6 +67,12 @@ class program extends control
         $this->display();
     }
 
+    /**
+     * Program kanban list.
+     * 
+     * @access public
+     * @return void
+     */
     public function kanban()
     {
         $this->app->loadLang('release');
diff --git a/module/program/model.php b/module/program/model.php
index 6b8bb8f347..2563671382 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -147,7 +147,7 @@ class programModel extends model
      * Get kanban group data.
      *
      * @access public
-     * @return void
+     * @return array 
      */
     public function getKanbanGroup()
     {
@@ -155,15 +155,7 @@ class programModel extends model
         $kanbanGroup['my']     = array();
         $kanbanGroup['others'] = array();
 
-        /* Get all prived programs. */
-        $programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)
-            ->where('type')->eq('program')
-            ->andWhere('deleted')->eq(0)
-            ->andWhere('grade')->eq(1)
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
-            ->andWhere('status')->ne('closed')
-            ->fetchAll('id');
-
+        $programs         = $this->getTopPairs('', 'noclosed');
         $involvedPrograms = $this->getInvolvedPrograms($this->app->user->account);
 
         /* Get all products under programs. */
@@ -175,10 +167,7 @@ class programModel extends model
             ->fetchGroup('program', 'id');
 
         $productPairs = array();
-        foreach($productGroup as $programID => $products)
-        {
-            foreach($products as $productID => $product) $productPairs[$productID] = $productID;
-        }
+        foreach($productGroup as $programID => $products) $productPairs = array_merge($productPairs, array_keys($products));
 
         /* Get all plans under products. */
         $plans = $this->dao->select('id, product, title')->from(TABLE_PRODUCTPLAN)
@@ -198,10 +187,7 @@ class programModel extends model
             ->fetchGroup('product');
 
         $projectPairs = array();
-        foreach($projectGroup as $projects)
-        {
-            foreach($projects as $project) $projectPairs[$project->id] = $project->id;
-        }
+        foreach($projectGroup as $projects) $projectPairs = array_merge($projectPairs, array_keys($projects));
 
         /* Get all releases under products. */
         $releases = $this->dao->select('product, id, name, marker')->from(TABLE_RELEASE)
@@ -233,7 +219,7 @@ class programModel extends model
 
         $hours = $this->computeProgress($tasks);
 
-        /* Group data. */
+        /* Group data by product. */
         foreach($productGroup as $programID => $products)
         {
             foreach($products as $productID => $product)
@@ -258,28 +244,23 @@ class programModel extends model
                     $project->hours     = zget($hours, $project->id, array());
                     $product->projects[$status][] = $project;
                 }
-
-                $product->rowspan = isset($product->projects['doing']) ? count($product->projects['doing']) > 0 ? count($product->projects['doing']) : 1 : 1;
             }
         }
 
-        /* Group data. */
-        foreach($programs as $programID => $program)
+        /* Group data by program. */
+        foreach($programs as $programID => $programName)
         {
-            $program->products = zget($productGroup, $programID, array());
-            $program->rowspan  = count($program->products) > 0 ? count($program->products) : 1;
-            foreach($program->products as $product)
-            {
-                if(isset($product->projects['doing']) and count($product->projects['doing']) > 0) $program->rowspan += count($product->projects['doing']) - 1;
-            }
+            $programGroup = new stdclass(); 
+            $programGroup->name     = $programName;
+            $programGroup->products = zget($productGroup, $programID, array());
 
             if(in_array($programID, $involvedPrograms))
             {
-                $kanbanGroup['my'][$programID] = $program;
+                $kanbanGroup['my'][$programID] = $programGroup;
             }
             else
             {
-                $kanbanGroup['others'][$programID] = $program;
+                $kanbanGroup['others'][$programID] = $programGroup;
             }
         }
 
@@ -291,29 +272,31 @@ class programModel extends model
      *
      * @param  string $account
      * @access public
-     * @return void
+     * @return array 
      */
     public function getInvolvedPrograms($account)
     {
         $involvedPrograms = array();
 
-        /* All involves in program table. */
-        $objects = $this->dao->select('id,type,project,path')->from(TABLE_PROGRAM)
-            ->where('deleted')->eq(0)
-            ->andWhere("(openedBy = '$account' or PM = '$account')")
-            ->fetchAll('id');
+        /* All objects in program table. */
+        $objects = $this->dao->select('id,type,project,parent,path,openedBy,PM')->from(TABLE_PROGRAM)->where('deleted')->eq(0)->fetchAll('id');
 
         foreach($objects as $id => $object)
         {
+            if($object->openedBy != $account and $object->PM != $account) continue;
+
             if($object->type == 'program') $involvedPrograms[$id] = $id;
             if($object->type == 'project')
             {
-                $programID = $this->getTopByID($id);
+                $programID = $this->getTopByPath($object->path);
                 $involvedPrograms[$programID] = $programID;
             }
             if($object->type == 'sprint' or $object->type == 'stage')
             {
-                $programID = $this->getTopByID($object->project);
+                $parentProject = zget($objects, $object->parent, array());
+                if(!$parentProject) continue;
+
+                $programID = $this->getTopByPath($parentProject->path);
                 $involvedPrograms[$programID] = $programID;
             }
         }
@@ -334,7 +317,10 @@ class programModel extends model
             }
             if($object->type == 'project')
             {
-                $programID = $this->getTopByID($objectID);
+                $project = zget($objects, $objectID, array());
+                if(!$project) continue;
+
+                $programID = $this->getTopByPath($project->path);
                 $involvedPrograms[$programID] = $programID;
             }
         }
@@ -351,12 +337,21 @@ class programModel extends model
         {
             if($object->type == 'project')
             {
-                $programID = $this->getTopByID($objectID);
+                $project = zget($objects, $objectID, array());
+                if(!$project) continue;
+
+                $programID = $this->getTopByPath($project->path);
                 $involvedPrograms[$programID] = $programID;
             }
-            if($object->type == 'execution')
+            if($object->type == 'sprint' or $object->type == 'stage')
             {
-                $programID = $this->getTopByID($object->project);
+                $execution = zget($objects, $objectID, array());
+                if(!$execution) continue;
+
+                $project   = zget($objects, $execution->parent, array());
+                if(!$project) continue;
+
+                $programID = $this->getTopByPath($project->path);
                 $involvedPrograms[$programID] = $programID;
             }
         }

From 4a2d06e13c56d9ba9c66e54b9d4a12dabe7a3be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 8 Sep 2021 13:36:54 +0800
Subject: [PATCH 27/30] * Finish task #42389.

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

diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 030782d378..6fc6fde9d2 100644
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -59,6 +59,7 @@ class pipelineModel extends model
             ->where('deleted')->eq('0')
             ->AndWhere('type')->eq($type)
             ->orderBy('id')->fetchPairs('id', 'name');
+
         return $pipeline;
     }
 

From b47d2bdf3194bbb2850dba71a709c9db6129cc9a Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:39:37 +0800
Subject: [PATCH 28/30] * fix incorrect num class in menu nav.

---
 module/index/js/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/index/js/index.js b/module/index/js/index.js
index 32a32df422..251de06f99 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -35,7 +35,8 @@
 
             item.icon = ($link.find('.icon').attr('class') || '').replace('icon ', '');
             item.text = $link.text().trim();
-            $link.html('<i class="icon ' + item.icon + '"></i><span class="text num">' + item.text + '</span>');
+            $link.html('<i class="icon ' + item.icon + '"></i><span class="text">' + item.text + '</span>');
+            if(item.code === 'devops') $link.find('.text').addClass('num');
             appsMap[item.code] = item;
 
             $('<li></li>').attr('data-app', item.code)

From 5d13c5119b90334ec2aff1ab6edef81ff04e46b0 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 8 Sep 2021 08:43:05 +0800
Subject: [PATCH 29/30] * Modify links in Project Kanban.

---
 module/common/view/kanban.html.php  |  2 +-
 module/project/view/kanban.html.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index efbd8ec9e9..e8a333fa02 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -181,7 +181,7 @@ function renderExecutionItem(item, $item)
         {
             $item.addClass('link-block');
             $title = $('<a class="title" />')
-                .attr('href', $.createLink('project', 'index', 'projectID=' + item._id));
+                .attr('href', $.createLink('execution', 'task', 'executionID=' + item._id));
         }
         else
         {
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index c5b32e74db..89d7f5ceb9 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -30,13 +30,13 @@
 </div>
 <?php
 $kanbanColumns = array();
-$kanbanColumns['waitProject'] = array('name' => $lang->project->waitProjects, 'type' => 'waitProject');
-$kanbanColumns['doingProject']    = array('name' => $lang->project->doingProjects, 'type' => 'doingProject');
-$kanbanColumns['doingExecution']  = array('name' => $lang->project->doingExecutions, 'type' => 'doingExecution');
+$kanbanColumns['waitProject']    = array('name' => $lang->project->waitProjects, 'type' => 'waitProject');
+$kanbanColumns['doingProject']   = array('name' => $lang->project->doingProjects, 'type' => 'doingProject');
+$kanbanColumns['doingExecution'] = array('name' => $lang->project->doingExecutions, 'type' => 'doingExecution');
 $kanbanColumns['closedProject']  = array('name' => $lang->project->closedProjects, 'type' => 'closedProject');
 $userPrivs = array();
-$userPrivs['project']     = common::hasPriv('project', 'index');
-$userPrivs['execution']   = common::hasPriv('execution', 'task');
+$userPrivs['project']   = common::hasPriv('project', 'index');
+$userPrivs['execution'] = common::hasPriv('execution', 'task');
 js::set('kanbanColumns',    $kanbanColumns);
 js::set('userPrivs',        $userPrivs);
 js::set('kanbanGroup',      $kanbanGroup);

From c5b835ae0e5737af5ec418afda813db8b9627372 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 8 Sep 2021 13:42:19 +0800
Subject: [PATCH 30/30] * Finish task#42383.

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

diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css
index c9db91d626..9312d4b9a4 100644
--- a/module/execution/css/executionkanban.css
+++ b/module/execution/css/executionkanban.css
@@ -19,3 +19,5 @@
 
 .table-grouped > tbody > tr,
 .table-grouped > tbody > tr:hover {background: #fff !important;}
+
+.projectColor {width: 5px; padding: 0px !important; border-right: unset !important}
diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php
index e416e41112..ce925b76b9 100644
--- a/module/execution/view/executionkanban.html.php
+++ b/module/execution/view/executionkanban.html.php
@@ -20,7 +20,7 @@
   <table class="table no-margin table-grouped text-center">
     <thead>
       <tr>
-        <th style='width: 5px; padding: 0px; border-right: unset !important'></th>
+        <th class='projectColor'></th>
         <th><?php echo $lang->execution->doingProject . ' (' . $projectCount . ')';?></th>
         <?php foreach($lang->execution->kanbanColType as $status => $colName):?>
         <th><?php echo $colName . ($status != 'closed' ? ' (' . $statusCount[$status] . ')' : '');?></th>