From 2eb3300ca6314f720a3e235bd462e80f9f7697e8 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Wed, 28 Sep 2022 13:29:26 +0800
Subject: [PATCH 001/129] * add xuanxuan notification send feedback and review

---
 .../ext/model/class/xuanxuan.class.php        | 72 +++++++++++++++++--
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index 8a33333ac8..9ea25f0734 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -23,10 +23,19 @@ class xuanxuanMessage extends messageModel
                 {
                     $field = 'obj.*,project.name as projectName,product.name as productName,execu.name as execuName';
                 }
+                else if($objectType == 'feedback')
+                {
+                    $field = 'obj.*,product.name as productName';
+                }
+                else if($objectType == 'review')
+                {
+                    $field = 'obj.*,project.name as projectName';
+                }
                 else
                 {
                     $field = 'obj.*';
                 }
+
                 $object = $this->dao->select($field)->from($this->config->objectTables[$objectType])->alias('obj')
                     ->beginIF($objectType == 'task')
                     ->leftJoin($this->config->objectTables['project'])->alias('project')->on('project.id = obj.project')
@@ -40,6 +49,12 @@ class xuanxuanMessage extends messageModel
                     ->leftJoin($this->config->objectTables['execution'])->alias('execu')->on('execu.id = obj.execution')
                     ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
                     ->fi()
+                    ->beginIF($objectType == 'feedback')
+                    ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
+                    ->fi()
+                    ->beginIF($objectType == 'review')
+                    ->leftJoin($this->config->objectTables['project'])->alias('project')->on('project.id = obj.project')
+                    ->fi()
                     ->where('obj.id')->eq($objectID)
                     ->fetch();
                 $field = $this->config->action->objectNameFields[$objectType];
@@ -49,18 +64,43 @@ class xuanxuanMessage extends messageModel
                     $notifyType = strtolower(explode(',', $extra)[0]);
                     if ($notifyType == 'pass')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'clarify')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'reject')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
                     }
                 }
 
+                if ($objectType == 'feedback' && ($actionType == 'tobug' || $actionType == 'tostory' || $actionType == 'totask' || $actionType == 'todo'))
+                {
+                    if ($actionType == 'tobug')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToBugTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'tostory')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToStoryTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'totask')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToTaskTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'todo')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToDoTitle, $this->app->user->realname, 1);
+                    }
+                }
+
+                if ($objectType == 'review' && $actionType == 'toaudit')
+                {
+                    $title = sprintf($this->lang->message->reviewToauditTitle, $this->app->user->realname, 1);
+                }
+
                 $server   = $this->loadModel('im')->getServer('zentao');
                 $onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : '';
                 unset($_GET['onlybody']);
@@ -71,10 +111,12 @@ class xuanxuanMessage extends messageModel
                 if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? $object->openedBy : $object->assignedTo;
                 if(!empty($object->mailto))     $target .= ",{$object->mailto}";
                 if(($objectType == 'mr' or $objectType == 'kanbancard') and !empty($object->createdBy)) $target .= ",{$object->createdBy}";
+                if($objectType == 'review') $target .= ",{$object->auditedBy}";
                 $target = trim($target, ',');
+                $target = explode(',', $target);
                 $target = $this->dao->select('id')->from(TABLE_USER)
                     ->where('account')->in($target)
-                    ->beginIF($objectType != 'mr')->andWhere('account')->ne($this->app->user->account)->fi()
+                    ->beginIF($objectType != 'mr' && $objectType != 'review')->andWhere('account')->ne($this->app->user->account)->fi()
                     ->fetchAll('id');
                 $target = array_keys($target);
 
@@ -110,6 +152,24 @@ class xuanxuanMessage extends messageModel
                     $subcontent->parentURL    = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink($parentType, 'browse', "id=$subcontent->parent", 'html'));
                     $subcontent->cardURL      = $url;
                 }
+                elseif($objectType == 'feedback')
+                {
+                    $subcontent->headTitle  = $object->productName;
+                    $subcontent->headSubTitle = $object->execuName;
+                    $subcontent->parentType = 'product';
+                    $subcontent->parent     = $object->product;
+                    $subcontent->parentURL  = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('feedback', 'browse', "id=$object->product", 'html'));
+                    $subcontent->cardURL    = $url;
+                }
+                elseif($objectType == 'review')
+                {
+                    $subcontent->headTitle  = $object->projectName;
+                    $subcontent->headSubTitle = $object->execuName;
+                    $subcontent->parentType = 'product';
+                    $subcontent->parent     = $object->product;
+                    $subcontent->parentURL  = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('review', 'browse', "id=$object->product", 'html'));
+                    $subcontent->cardURL    = $url;
+                }
                 else
                 {
                     $subcontent->parentType = $objectType;
@@ -146,11 +206,11 @@ class xuanxuanMessage extends messageModel
                     $contentData->actions     = array();
                     $contentData->url         = "xxc:openInApp/zentao-integrated/" . urlencode($url);
                 }
-                $contentData->extra = $extra;
+                $contentData->extra = is_array($extra) ? $extra : '';
 
                 $content = json_encode($contentData);
                 $avatarUrl = $server . $this->app->getWebRoot() . 'favicon.ico';
-                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
+                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story' || $objectType == 'feedback' || $objectType == 'review')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
 
                 if($objectType == 'mr' and is_array($this->lang->message->mr->$actionType) and !empty($object->assignee))
                 {

From 434afe33af0d7b175fcf229e368d03ebc4ce2df0 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Wed, 28 Sep 2022 16:03:11 +0800
Subject: [PATCH 002/129] * add lang about zentao client notification feedback
 and review

---
 xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php   | 7 +++++++
 xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php   | 7 +++++++
 xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php   | 7 +++++++
 .../extension/xuan/message/ext/lang/zh-cn/xuanxuan.php     | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
index 8fbd39f334..73807b5a85 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
@@ -8,6 +8,13 @@ $lang->message->notifyPassTitle    = '%s passed %d stories';
 $lang->message->notifyClarifyTitle = '%s clarify %d stories';
 $lang->message->notifyRejectTitle  = '%s reject %d stories';
 
+$lang->message->feedbackToBugTitle    = '%s have forwarded %d feedback to bug';
+$lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
+$lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
+$lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
+
+$lang->message->reviewToauditTitle  = '%s have submit %d audits';
+
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
index 8fbd39f334..73807b5a85 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
@@ -8,6 +8,13 @@ $lang->message->notifyPassTitle    = '%s passed %d stories';
 $lang->message->notifyClarifyTitle = '%s clarify %d stories';
 $lang->message->notifyRejectTitle  = '%s reject %d stories';
 
+$lang->message->feedbackToBugTitle    = '%s have forwarded %d feedback to bug';
+$lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
+$lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
+$lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
+
+$lang->message->reviewToauditTitle  = '%s have submit %d audits';
+
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
index 8fbd39f334..73807b5a85 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
@@ -8,6 +8,13 @@ $lang->message->notifyPassTitle    = '%s passed %d stories';
 $lang->message->notifyClarifyTitle = '%s clarify %d stories';
 $lang->message->notifyRejectTitle  = '%s reject %d stories';
 
+$lang->message->feedbackToBugTitle    = '%s have forwarded %d feedback to bug';
+$lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
+$lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
+$lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
+
+$lang->message->reviewToauditTitle  = '%s have submit %d audits';
+
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
index 7503db0276..2d71146eab 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
@@ -8,6 +8,13 @@ $lang->message->notifyPassTitle    = '%s 通过了%d个研发需求';
 $lang->message->notifyClarifyTitle = '%s 驳回了%d个研发需求';
 $lang->message->notifyRejectTitle  = '%s 拒绝了%d个研发需求';
 
+$lang->message->feedbackToBugTitle    = '%s 已将%d个反馈转至bug';
+$lang->message->feedbackToTaskTitle   = '%s 已将%d个反馈转至任务';
+$lang->message->feedbackToDoTitle     = '%s 已将%d个反馈转至待办';
+$lang->message->feedbackToStoryTitle  = '%s 已将%d个反馈转至研发需求';
+
+$lang->message->reviewToauditTitle  = '%s 已经提交了%d个审计';
+
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = '构建日志';
 $lang->message->mr->compilefail = '您提交的合并请求：%s，构建任务执行失败';

From d807c2d0d1ef882358fbd18735af3eb9843e27d4 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Wed, 28 Sep 2022 16:54:01 +0800
Subject: [PATCH 003/129] * fix delete user show dialog abnormal in zentao
 client

---
 module/user/css/delete.css | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 module/user/css/delete.css

diff --git a/module/user/css/delete.css b/module/user/css/delete.css
new file mode 100644
index 0000000000..21e3b77e30
--- /dev/null
+++ b/module/user/css/delete.css
@@ -0,0 +1,4 @@
+.xxc-embed.body-modal #mainContent {
+    position: relative;
+    top: 70px;
+}
\ No newline at end of file

From 9637c6d3030461983922fb08f2ddbbaba5004d52 Mon Sep 17 00:00:00 2001
From: jyeu <chen@jyeu.xyz>
Date: Thu, 29 Sep 2022 16:20:02 +0800
Subject: [PATCH 004/129] * add an exception for approval flow notifications.

---
 .../extension/xuan/im/ext/model/class/xuanxuan.class.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
index 8391277656..d1074e6e53 100644
--- a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
@@ -214,11 +214,16 @@ class xuanxuanIm extends imModel
                     $messageGroups[$contentData->contentType][] = $message;
                     continue;
                 }
-                if ($contentData->objectType == 'story' && $contentData->action == 'reviewed')
+                if($contentData->objectType == 'story' && $contentData->action == 'reviewed')
                 {
                     $extra = explode(',', $contentDataOuter->extra)[0];
                     $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor-$extra"][] = $message;
                 }
+                if($message->contentType == 'text')
+                {
+                    $messageGroups['text'][] = $message;
+                    continue;
+                }
                 else
                 {
                     $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor"][] = $message;

From 98bb2938b77cf8fb2c670ea79a6dc74345ddcedc Mon Sep 17 00:00:00 2001
From: denghongtao <denghongtao@easycorp.ltd>
Date: Mon, 10 Oct 2022 01:36:40 +0000
Subject: [PATCH 005/129] Add repo unittest.

---
 test/class/repo.class.php        | 22 ++++++++++++++++++----
 test/model/repo/getcloneurl.php  | 15 ++++++++++++++-
 test/model/repo/getlistbyscm.php |  7 ++++++-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/test/class/repo.class.php b/test/class/repo.class.php
index 7ed1021ee4..85ced91220 100644
--- a/test/class/repo.class.php
+++ b/test/class/repo.class.php
@@ -43,20 +43,34 @@ class repoTest
 
     public function getListTest($projectID = 0, $SCM = '', $orderBy = 'id_desc', $pager = null)
     {
-        $objects = $this->objectModel->getList($projectID, $SCM, $orderBy, $pager);
+        $objects = $this->objectModel->getList($projectID , $SCM, $orderBy , $pager );
 
         if(dao::isError()) return dao::getError();
 
-        return $objects;
+        if(!empty($objects))
+        {
+           return $objects[1]->name;
+        }
+        else
+        {
+           return 'empty';
+        }
     }
 
     public function getListBySCMTest($scm, $type = 'all')
     {
-        $objects = $this->objectModel->getListBySCM($scm, $type);
+        $objects = $this->objectModel->getListBySCM($scm, $type = 'all');
 
         if(dao::isError()) return dao::getError();
 
-        return $objects;
+        if(!empty($objects))
+        {
+            return $objects[0]->name;
+        }
+        else
+        {
+            return 'empty';
+        }
     }
 
     public function createTest()
diff --git a/test/model/repo/getcloneurl.php b/test/model/repo/getcloneurl.php
index 0cb095ca1c..8ec0ae5734 100644
--- a/test/model/repo/getcloneurl.php
+++ b/test/model/repo/getcloneurl.php
@@ -13,5 +13,18 @@ pid=1
 */
 
 $repo = new repoTest();
+$result1 = $repo->getCloneUrlTest(1);
+$result2 = $repo->getCloneUrlTest(2);
+$result3 = $repo->getCloneUrlTest(3);
+$result4 = $repo->getCloneUrlTest(4);
+$result5 = $repo->getCloneUrlTest(7);
+$result6 = $repo->getCloneUrlTest(11);
+$result7 = $repo->getCloneUrlTest(0);
 
-r($repo->getCloneUrlTest()) && p() && e();
\ No newline at end of file
+r($result1) && p('http') && e('');
+r($result2) && p('http') && e('');
+r($result3) && p('http') && e('');
+r($result4) && p('http') && e('');
+r($result5) && p('http') && e('');
+r($result6) && p('http') && e('');
+r($result7) && p('http') && e('');
diff --git a/test/model/repo/getlistbyscm.php b/test/model/repo/getlistbyscm.php
index ad618ee52b..d5f4a2b09e 100644
--- a/test/model/repo/getlistbyscm.php
+++ b/test/model/repo/getlistbyscm.php
@@ -13,5 +13,10 @@ pid=1
 */
 
 $repo = new repoTest();
+$result1 = $repo->getListBySCMTest('Gitlab');
+$result2 = $repo->getListBySCMTest('gogs');
+$result3 = $repo->getListBySCMTest('empty');
 
-r($repo->getListBySCMTest()) && p() && e();
\ No newline at end of file
+r($result1) && p('') && e('723test');
+r($result2) && p('') && e('empty');
+r($result3) && p('') && e('empty');

From 57c0dcbb8403611f0c6db3c0f106c90c57162281 Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Wed, 26 Oct 2022 13:13:50 +0800
Subject: [PATCH 006/129] Revert "* add an exception for approval flow
 notifications."

This reverts commit 9637c6d3030461983922fb08f2ddbbaba5004d52.
---
 .../extension/xuan/im/ext/model/class/xuanxuan.class.php   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
index d1074e6e53..8391277656 100644
--- a/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/im/ext/model/class/xuanxuan.class.php
@@ -214,16 +214,11 @@ class xuanxuanIm extends imModel
                     $messageGroups[$contentData->contentType][] = $message;
                     continue;
                 }
-                if($contentData->objectType == 'story' && $contentData->action == 'reviewed')
+                if ($contentData->objectType == 'story' && $contentData->action == 'reviewed')
                 {
                     $extra = explode(',', $contentDataOuter->extra)[0];
                     $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor-$extra"][] = $message;
                 }
-                if($message->contentType == 'text')
-                {
-                    $messageGroups['text'][] = $message;
-                    continue;
-                }
                 else
                 {
                     $messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor"][] = $message;

From c761197f0a63b1dbe07a70d2885805ac63031b1b Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Wed, 26 Oct 2022 13:14:09 +0800
Subject: [PATCH 007/129] Revert "* add xuanxuan notification send feedback and
 review"

This reverts commit 2eb3300ca6314f720a3e235bd462e80f9f7697e8.
---
 .../ext/model/class/xuanxuan.class.php        | 72 ++-----------------
 1 file changed, 6 insertions(+), 66 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index 9ea25f0734..8a33333ac8 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -23,19 +23,10 @@ class xuanxuanMessage extends messageModel
                 {
                     $field = 'obj.*,project.name as projectName,product.name as productName,execu.name as execuName';
                 }
-                else if($objectType == 'feedback')
-                {
-                    $field = 'obj.*,product.name as productName';
-                }
-                else if($objectType == 'review')
-                {
-                    $field = 'obj.*,project.name as projectName';
-                }
                 else
                 {
                     $field = 'obj.*';
                 }
-
                 $object = $this->dao->select($field)->from($this->config->objectTables[$objectType])->alias('obj')
                     ->beginIF($objectType == 'task')
                     ->leftJoin($this->config->objectTables['project'])->alias('project')->on('project.id = obj.project')
@@ -49,12 +40,6 @@ class xuanxuanMessage extends messageModel
                     ->leftJoin($this->config->objectTables['execution'])->alias('execu')->on('execu.id = obj.execution')
                     ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
                     ->fi()
-                    ->beginIF($objectType == 'feedback')
-                    ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
-                    ->fi()
-                    ->beginIF($objectType == 'review')
-                    ->leftJoin($this->config->objectTables['project'])->alias('project')->on('project.id = obj.project')
-                    ->fi()
                     ->where('obj.id')->eq($objectID)
                     ->fetch();
                 $field = $this->config->action->objectNameFields[$objectType];
@@ -64,43 +49,18 @@ class xuanxuanMessage extends messageModel
                     $notifyType = strtolower(explode(',', $extra)[0]);
                     if ($notifyType == 'pass')
                     {
-                        $title = sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'clarify')
                     {
-                        $title = sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'reject')
                     {
-                        $title = sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
+                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
                     }
                 }
 
-                if ($objectType == 'feedback' && ($actionType == 'tobug' || $actionType == 'tostory' || $actionType == 'totask' || $actionType == 'todo'))
-                {
-                    if ($actionType == 'tobug')
-                    {
-                        $title = sprintf($this->lang->message->feedbackToBugTitle, $this->app->user->realname, 1);
-                    }
-                    else if($actionType == 'tostory')
-                    {
-                        $title = sprintf($this->lang->message->feedbackToStoryTitle, $this->app->user->realname, 1);
-                    }
-                    else if($actionType == 'totask')
-                    {
-                        $title = sprintf($this->lang->message->feedbackToTaskTitle, $this->app->user->realname, 1);
-                    }
-                    else if($actionType == 'todo')
-                    {
-                        $title = sprintf($this->lang->message->feedbackToDoTitle, $this->app->user->realname, 1);
-                    }
-                }
-
-                if ($objectType == 'review' && $actionType == 'toaudit')
-                {
-                    $title = sprintf($this->lang->message->reviewToauditTitle, $this->app->user->realname, 1);
-                }
-
                 $server   = $this->loadModel('im')->getServer('zentao');
                 $onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : '';
                 unset($_GET['onlybody']);
@@ -111,12 +71,10 @@ class xuanxuanMessage extends messageModel
                 if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? $object->openedBy : $object->assignedTo;
                 if(!empty($object->mailto))     $target .= ",{$object->mailto}";
                 if(($objectType == 'mr' or $objectType == 'kanbancard') and !empty($object->createdBy)) $target .= ",{$object->createdBy}";
-                if($objectType == 'review') $target .= ",{$object->auditedBy}";
                 $target = trim($target, ',');
-                $target = explode(',', $target);
                 $target = $this->dao->select('id')->from(TABLE_USER)
                     ->where('account')->in($target)
-                    ->beginIF($objectType != 'mr' && $objectType != 'review')->andWhere('account')->ne($this->app->user->account)->fi()
+                    ->beginIF($objectType != 'mr')->andWhere('account')->ne($this->app->user->account)->fi()
                     ->fetchAll('id');
                 $target = array_keys($target);
 
@@ -152,24 +110,6 @@ class xuanxuanMessage extends messageModel
                     $subcontent->parentURL    = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink($parentType, 'browse', "id=$subcontent->parent", 'html'));
                     $subcontent->cardURL      = $url;
                 }
-                elseif($objectType == 'feedback')
-                {
-                    $subcontent->headTitle  = $object->productName;
-                    $subcontent->headSubTitle = $object->execuName;
-                    $subcontent->parentType = 'product';
-                    $subcontent->parent     = $object->product;
-                    $subcontent->parentURL  = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('feedback', 'browse', "id=$object->product", 'html'));
-                    $subcontent->cardURL    = $url;
-                }
-                elseif($objectType == 'review')
-                {
-                    $subcontent->headTitle  = $object->projectName;
-                    $subcontent->headSubTitle = $object->execuName;
-                    $subcontent->parentType = 'product';
-                    $subcontent->parent     = $object->product;
-                    $subcontent->parentURL  = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('review', 'browse', "id=$object->product", 'html'));
-                    $subcontent->cardURL    = $url;
-                }
                 else
                 {
                     $subcontent->parentType = $objectType;
@@ -206,11 +146,11 @@ class xuanxuanMessage extends messageModel
                     $contentData->actions     = array();
                     $contentData->url         = "xxc:openInApp/zentao-integrated/" . urlencode($url);
                 }
-                $contentData->extra = is_array($extra) ? $extra : '';
+                $contentData->extra = $extra;
 
                 $content = json_encode($contentData);
                 $avatarUrl = $server . $this->app->getWebRoot() . 'favicon.ico';
-                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story' || $objectType == 'feedback' || $objectType == 'review')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
+                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
 
                 if($objectType == 'mr' and is_array($this->lang->message->mr->$actionType) and !empty($object->assignee))
                 {

From 5a84b1669ea417ed9e3360dafcc47fcc9abb5782 Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Wed, 26 Oct 2022 13:29:20 +0800
Subject: [PATCH 008/129] * add xuanxuan feedback notifications.

---
 .../xuan/message/ext/lang/de/xuanxuan.php     |  2 -
 .../xuan/message/ext/lang/en/xuanxuan.php     |  2 -
 .../xuan/message/ext/lang/fr/xuanxuan.php     |  2 -
 .../xuan/message/ext/lang/zh-cn/xuanxuan.php  |  2 -
 .../ext/model/class/xuanxuan.class.php        | 46 +++++++++++++++++--
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
index 73807b5a85..f81d6076f2 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/de/xuanxuan.php
@@ -13,8 +13,6 @@ $lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
 $lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
 $lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
 
-$lang->message->reviewToauditTitle  = '%s have submit %d audits';
-
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
index 73807b5a85..f81d6076f2 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/en/xuanxuan.php
@@ -13,8 +13,6 @@ $lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
 $lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
 $lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
 
-$lang->message->reviewToauditTitle  = '%s have submit %d audits';
-
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
index 73807b5a85..f81d6076f2 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/fr/xuanxuan.php
@@ -13,8 +13,6 @@ $lang->message->feedbackToTaskTitle   = '%s have forwarded %d feedback to task';
 $lang->message->feedbackToDoTitle     = '%s have forwarded %d feedback to todo';
 $lang->message->feedbackToStoryTitle  = '%s have forwarded %d feedback to story';
 
-$lang->message->reviewToauditTitle  = '%s have submit %d audits';
-
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = 'Build log';
 $lang->message->mr->compilefail = 'Your submitted merge request: %s, build failed';
diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
index 2d71146eab..ab4bfdae20 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
@@ -13,8 +13,6 @@ $lang->message->feedbackToTaskTitle   = '%s 已将%d个反馈转至任务';
 $lang->message->feedbackToDoTitle     = '%s 已将%d个反馈转至待办';
 $lang->message->feedbackToStoryTitle  = '%s 已将%d个反馈转至研发需求';
 
-$lang->message->reviewToauditTitle  = '%s 已经提交了%d个审计';
-
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = '构建日志';
 $lang->message->mr->compilefail = '您提交的合并请求：%s，构建任务执行失败';
diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index 8a33333ac8..b5cfc3ba77 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -23,6 +23,10 @@ class xuanxuanMessage extends messageModel
                 {
                     $field = 'obj.*,project.name as projectName,product.name as productName,execu.name as execuName';
                 }
+                else if($objectType == 'feedback')
+                {
+                    $field = 'obj.*,product.name as productName';
+                }
                 else
                 {
                     $field = 'obj.*';
@@ -40,6 +44,9 @@ class xuanxuanMessage extends messageModel
                     ->leftJoin($this->config->objectTables['execution'])->alias('execu')->on('execu.id = obj.execution')
                     ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
                     ->fi()
+                    ->beginIF($objectType == 'feedback')
+                    ->leftJoin($this->config->objectTables['product'])->alias('product')->on('product.id = obj.product')
+                    ->fi()
                     ->where('obj.id')->eq($objectID)
                     ->fetch();
                 $field = $this->config->action->objectNameFields[$objectType];
@@ -49,15 +56,35 @@ class xuanxuanMessage extends messageModel
                     $notifyType = strtolower(explode(',', $extra)[0]);
                     if ($notifyType == 'pass')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'clarify')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyClarifyTitle, $this->app->user->realname, 1);
                     }
                     else if($notifyType == 'reject')
                     {
-                        $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
+                        $title = sprintf($this->lang->message->notifyRejectTitle, $this->app->user->realname, 1);
+                    }
+                }
+
+                if ($objectType == 'feedback' && ($actionType == 'tobug' || $actionType == 'tostory' || $actionType == 'totask' || $actionType == 'todo'))
+                {
+                    if ($actionType == 'tobug')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToBugTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'tostory')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToStoryTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'totask')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToTaskTitle, $this->app->user->realname, 1);
+                    }
+                    else if($actionType == 'todo')
+                    {
+                        $title = sprintf($this->lang->message->feedbackToDoTitle, $this->app->user->realname, 1);
                     }
                 }
 
@@ -110,6 +137,15 @@ class xuanxuanMessage extends messageModel
                     $subcontent->parentURL    = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink($parentType, 'browse', "id=$subcontent->parent", 'html'));
                     $subcontent->cardURL      = $url;
                 }
+                elseif($objectType == 'feedback')
+                {
+                    $subcontent->headTitle  = $object->productName;
+                    $subcontent->headSubTitle = $object->execuName;
+                    $subcontent->parentType = 'product';
+                    $subcontent->parent     = $object->product;
+                    $subcontent->parentURL  = "xxc:openInApp/zentao-integrated/" . urlencode($server . helper::createLink('feedback', 'browse', "id=$object->product", 'html'));
+                    $subcontent->cardURL    = $url;
+                }
                 else
                 {
                     $subcontent->parentType = $objectType;
@@ -146,11 +182,11 @@ class xuanxuanMessage extends messageModel
                     $contentData->actions     = array();
                     $contentData->url         = "xxc:openInApp/zentao-integrated/" . urlencode($url);
                 }
-                $contentData->extra = $extra;
+                $contentData->extra = is_array($extra) ? $extra : '';
 
                 $content = json_encode($contentData);
                 $avatarUrl = $server . $this->app->getWebRoot() . 'favicon.ico';
-                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
+                if($target && ($objectType == 'bug' || $objectType == 'task' || $objectType == 'story' || $objectType == 'feedback')) $this->loadModel('im')->messageCreateNotify($target, $title, $subtitle = '', $content, $contentType = 'object', $url, $actions = array(), $sender = array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender, 'avatar' => $avatarUrl));
 
                 if($objectType == 'mr' and is_array($this->lang->message->mr->$actionType) and !empty($object->assignee))
                 {

From eb68363dee0d33b2be904f623a6ba64eaa1afdc4 Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Thu, 27 Oct 2022 14:31:35 +0800
Subject: [PATCH 009/129] * fix xuanxuan feedback notify users.

---
 .../message/ext/model/class/xuanxuan.class.php  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index b5cfc3ba77..a289572e73 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -95,10 +95,23 @@ class xuanxuanMessage extends messageModel
                 $url    = $server . helper::createLink($objectType == 'kanbancard' ? 'kanban' : $objectType, 'view', "id=$dataID", 'html');
 
                 $target = '';
-                if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? $object->openedBy : $object->assignedTo;
-                if(!empty($object->mailto))     $target .= ",{$object->mailto}";
+                if($objectType == 'feedback')
+                {
+                    $feedback   = $this->loadModel('feedback')->getByID($objectID);
+                    $senderUser = $this->feedback->getToAndCcList($feedback);
+                    foreach ($senderUser as $user)
+                    {
+                        $target .= ',' . $user;
+                    }
+                }
+                else
+                {
+                    if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? $object->openedBy : $object->assignedTo;
+                    if(!empty($object->mailto))     $target .= ",{$object->mailto}";
+                }
                 if(($objectType == 'mr' or $objectType == 'kanbancard') and !empty($object->createdBy)) $target .= ",{$object->createdBy}";
                 $target = trim($target, ',');
+                $target = explode(',', $target);
                 $target = $this->dao->select('id')->from(TABLE_USER)
                     ->where('account')->in($target)
                     ->beginIF($objectType != 'mr')->andWhere('account')->ne($this->app->user->account)->fi()

From c9996776961550d1b2be73032f33fc42b9082199 Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Thu, 27 Oct 2022 16:28:09 +0800
Subject: [PATCH 010/129] Revert "* fix delete user show dialog abnormal in
 zentao client"

This reverts commit d807c2d0d1ef882358fbd18735af3eb9843e27d4.
---
 module/user/css/delete.css | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 module/user/css/delete.css

diff --git a/module/user/css/delete.css b/module/user/css/delete.css
deleted file mode 100644
index 21e3b77e30..0000000000
--- a/module/user/css/delete.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.xxc-embed.body-modal #mainContent {
-    position: relative;
-    top: 70px;
-}
\ No newline at end of file

From f54206866f058ba7a3d5eb69b67287119a7e08e6 Mon Sep 17 00:00:00 2001
From: Chenjianyu <chenjianyu@@easycorp.ltd>
Date: Fri, 28 Oct 2022 08:48:56 +0800
Subject: [PATCH 011/129] * clean up white space.

---
 .../xuan/message/ext/model/class/xuanxuan.class.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
index a289572e73..7debadf704 100644
--- a/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+++ b/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
@@ -51,10 +51,10 @@ class xuanxuanMessage extends messageModel
                     ->fetch();
                 $field = $this->config->action->objectNameFields[$objectType];
                 $title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyTitle, $this->app->user->realname, $this->lang->action->label->$actionType, 1, $this->lang->action->objectTypes[$objectType]);
-                if ($objectType == 'story' && $actionType == 'reviewed' && !empty($extra))
+                if($objectType == 'story' && $actionType == 'reviewed' && !empty($extra))
                 {
                     $notifyType = strtolower(explode(',', $extra)[0]);
-                    if ($notifyType == 'pass')
+                    if($notifyType == 'pass')
                     {
                         $title = sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
                     }
@@ -68,9 +68,9 @@ class xuanxuanMessage extends messageModel
                     }
                 }
 
-                if ($objectType == 'feedback' && ($actionType == 'tobug' || $actionType == 'tostory' || $actionType == 'totask' || $actionType == 'todo'))
+                if($objectType == 'feedback' && ($actionType == 'tobug' || $actionType == 'tostory' || $actionType == 'totask' || $actionType == 'todo'))
                 {
-                    if ($actionType == 'tobug')
+                    if($actionType == 'tobug')
                     {
                         $title = sprintf($this->lang->message->feedbackToBugTitle, $this->app->user->realname, 1);
                     }
@@ -99,7 +99,7 @@ class xuanxuanMessage extends messageModel
                 {
                     $feedback   = $this->loadModel('feedback')->getByID($objectID);
                     $senderUser = $this->feedback->getToAndCcList($feedback);
-                    foreach ($senderUser as $user)
+                    foreach($senderUser as $user)
                     {
                         $target .= ',' . $user;
                     }

From 43be2741b43fb4d08fd9abf337df9389242f3323 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 3 Nov 2022 05:42:11 +0000
Subject: [PATCH 012/129] * Resolved feedback #1353.

---
 module/execution/control.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index 22b35d12db..babd7a50ec 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2564,6 +2564,12 @@ class execution extends control
         $projects   = $this->project->getPairsByProgram('', 'noclosed');
         $executions = $this->execution->getStatData(0, 'all', 0, 0, false, '', 'id_desc');
 
+        foreach($executions as $execution)
+        {
+            $execution->name = htmlspecialchars_decode($execution->name);
+            $execution->team = htmlspecialchars_decode($execution->team);
+        }
+
         $teams = $this->dao->select('root,account')->from(TABLE_TEAM)
             ->where('root')->in($this->app->user->view->sprints)
             ->andWhere('type')->eq('execution')

From c25a79a1f5b78dd65e13ef2c6410119d75def9e7 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Tue, 15 Nov 2022 11:02:27 +0800
Subject: [PATCH 013/129] * Add cteate yaml file test example.

---
 test/lib/yaml.class.php       | 90 ++++++++++++++++++++++-------------
 test/model/action/getbyid.php | 13 +++--
 2 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index 8e96353772..d96e1e90c2 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -1,6 +1,6 @@
 <?php
 /**
- *本文件主要进行生成每个脚本文件对应的测试数据yaml文件。
+ * 本文件主要进行生成每个脚本文件对应的测试数据yaml文件。
  *
  * All request of entries should be routed by this router.
  *
@@ -8,10 +8,21 @@
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      liyang <liyang@easycorp.ltd>
  * @package     ZenTaoPMS
- * @version     $Id: $
+ * @version     1.0
  * @link        http://www.zentao.net/
  */
-class yaml
+
+/**
+ * Set fields for test data yaml file.
+ *
+ * @copyright Copyright 2009-2022 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
+ * @author    liyang <liyang@easycorp.ltd>
+ * @package
+ * @license   LGPL
+ * @version   1.0
+ * @Link      https://www.zentao.net
+ */
+class field
 {
     /**
      * Global config.
@@ -22,12 +33,12 @@ class yaml
     public $config;
 
     /**
-     * Filed Arr.
+     * Field Arr.
      *
      * @var array
      * @access public
      */
-    public  $fieldArr = array();
+    public $fieldArr = array();
 
     /**
      * Field.
@@ -72,7 +83,7 @@ class yaml
     }
 
     /**
-     * Set yaml filed.
+     * Set yaml field.
      *
      * @param  string    $value
      * @access public
@@ -86,7 +97,7 @@ class yaml
     }
 
     /**
-     * Set filed rang.
+     * Set field rang.
      *
      * @param  string    $range
      * @access public
@@ -118,7 +129,7 @@ class yaml
      * @access public
      * @return object
      */
-    function postfix($postfix)
+    public function postfix($postfix)
     {
         $this->fieldArr[$this->field]['postfix'] = $postfix;
         return $this;
@@ -131,7 +142,7 @@ class yaml
      * @access public
      * @return object
      */
-    function type($type)
+    public function type($type)
     {
         $this->fieldArr[$this->field]['type'] =  $type;
         return $this;
@@ -144,24 +155,24 @@ class yaml
      * @access public
      * @return object
      */
-    function format($format)
+    public function format($format)
     {
         $this->fieldArr[$this->field]['format'] =  $format;
         return $this;
     }
 
     /**
-     * set field fields.
+     * Set field fields.
      *
      * @param  array    $fields
      * @access public
      * @return object
      */
-    function fields($fields)
+    public function fields($fields)
     {
         if(!is_array($fields))
         {
-            echo "fileds must be an array";
+            echo "fields must be an array";
             return;
         }
 
@@ -170,31 +181,32 @@ class yaml
     }
 
     /**
-     * get field array value.
+     * Get field array.
      *
      * @access public
      * @return array
      */
-    function getField()
+    public function getFields()
     {
+        var_dump($this->fieldArr);
         return $this->fieldArr;
     }
 
     /**
      * Assembly field generation rules.
      *
-     * @param  array     $filedArr
+     * @param  array     $fieldArr
      * @access public
      * @return array
      */
-    function setFieldRule($filedArr)
+    public function setFieldRule($fieldArr)
     {
         $ruleArr = array();
         $index   = 0;
 
-        foreach($filedArr as $filed => $rule)
+        foreach($fieldArr as $field => $rule)
         {
-            $ruleArr[$index]['field'] = $filed;
+            $ruleArr[$index]['field'] = $field;
 
             if(array_key_exists('fields', $rule))
             {
@@ -202,7 +214,7 @@ class yaml
             }
             else
             {
-                if(!empty($rule['range'])) $ruleArr[$index]['range']   = $rule['range'];
+                if(!empty($rule['range'])) $ruleArr[$index]['range'] = $rule['range'];
             }
 
             if(!empty($rule['prefix']))  $ruleArr[$index]['prefix']  = $rule['prefix'];
@@ -224,23 +236,37 @@ class yaml
      * @access public
      * @return void
      */
-    function build($model, $name, $version = '')
+    public function build($model, $name, $version = '')
     {
         if(!is_dir($this->yamlDir . "/{$model}/data")) mkdir($this->yamlDir . "/{$model}/data", 0700);
         $yamlFile = $this->yamlDir . "/{$model}/data/{$name}.yaml";
 
         $yamlDataArr = array();
 
-        $yamlDataArr['title']   = "zt_{$name}";
-        $yamlDataArr['author']  = "auto_{$name}";
+        $yamlDataArr['title']  = "zt_{$name}";
+        $yamlDataArr['author'] = "auto_{$name}";
         $version ? $yamlDataArr['version'] = $version : $yamlDataArr['version'] = '1.0';
 
         if(empty($this->fieldArr)) return;
         $yamlDataArr['fields'] = $this->setFieldRule($this->fieldArr);
 
-        yaml_emit_file($yamlFile, $yamlDataArr);
+        yaml_emit_file($yamlFile, $yamlDataArr, YAML_UTF8_ENCODING);
     }
+}
 
+/**
+ * Create test data from yaml file.
+ *
+ * @copyright Copyright 2009-2022 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
+ * @author    liyang <liyang@easycorp.ltd>
+ * @package
+ * @uses      field
+ * @license   LGPL
+ * @version   1.0
+ * @Link      https://www.zentao.net
+ */
+class yaml extends field
+{
     /**
      * Insert the data into database.
      *
@@ -252,8 +278,8 @@ class yaml
      */
     function insertDB($model, $file, $tableName, $rows, $isClear = false)
     {
-        $yamlFile     = $this->yamlDir . "/{$model}/data/{$file}.yaml";
-        $tableSqlDir  = $this->yamlDir . "/{$model}/data/sql";
+        $yamlFile    = $this->yamlDir . "/{$model}/data/{$file}.yaml";
+        $tableSqlDir = $this->yamlDir . "/{$model}/data/sql";
 
         if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0700);
         $dumpCommand = "mysqldump -u%s -p%s -h%s -P%s %s %s > {$tableSqlDir}/{$tableName}.sql";
@@ -269,7 +295,7 @@ class yaml
         $dbUser    = $this->config->db->user;
         $dbPWD     = $this->config->db->password;
 
-        $command  = "$zdPath -c %s -d %s -n %d -t %s --trim -dns mysql://%s:%s@%s:%s/%s#utf8";
+        $command = "$zdPath -c %s -d %s -n %d -t %s -dns mysql://%s:%s@%s:%s/%s#utf8";
         if($isClear === true) $command .= ' --clear';
         $execYaml = sprintf($command, $configYaml, $yamlFile, $rows, $tableName, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName);
         $execDump = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
@@ -290,11 +316,11 @@ class yaml
         $tableSql = $this->yamlDir . "/{$model}/data/sql/$tableName.sql";
         if(!is_file($tableSql)) return false;
 
-        $dbName    = $this->config->db->name;
-        $dbHost    = $this->config->db->host;
-        $dbPort    = $this->config->db->port;
-        $dbUser    = $this->config->db->user;
-        $dbPWD     = $this->config->db->password;
+        $dbName = $this->config->db->name;
+        $dbHost = $this->config->db->host;
+        $dbPort = $this->config->db->port;
+        $dbUser = $this->config->db->user;
+        $dbPWD  = $this->config->db->password;
 
         $command     = "mysql -u%s -p%s -h%s -P%s %s < %s";
         $execRestore = sprintf($command, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableSql);
diff --git a/test/model/action/getbyid.php b/test/model/action/getbyid.php
index 1df040499b..35c9d7b48c 100755
--- a/test/model/action/getbyid.php
+++ b/test/model/action/getbyid.php
@@ -3,7 +3,13 @@
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/action.class.php';
 su('admin');
-
+$yaml->id->range('101-105');
+$yaml->objectType->range("product,story,productplan,release");
+$yaml->action->range("common,extra,opened,created,changed");
+$yaml->comment->range("1-5")->prefix("这是一个系统日志测试备注");
+$yaml->getFields();
+$yaml->build('action', 'action_getbyid');
+$yaml->insertDB('action', 'action_getbyid', 'action', 5);
 /**
 
 title=测试 actionModel->getById();
@@ -18,7 +24,7 @@ pid=1
 
 */
 
-$actionIDList = array('1', '2', '3', '4', '5');
+$actionIDList = array('101', '102', '103', '104', '105');
 
 $action = new actionTest();
 
@@ -26,4 +32,5 @@ r($action->getByIdTest($actionIDList[0])) && p('objectType,objectId,action,comme
 r($action->getByIdTest($actionIDList[1])) && p('objectType,objectId,action,comment') && e('story,,extra,这是一个系统日志测试备注2');        // 测试获取动态2的信息
 r($action->getByIdTest($actionIDList[2])) && p('objectType,objectId,action,comment') && e('productplan,,opened,这是一个系统日志测试备注3'); // 测试获取动态3的信息
 r($action->getByIdTest($actionIDList[3])) && p('objectType,objectId,action,comment') && e('release,,created,这是一个系统日志测试备注4');    // 测试获取动态4的信息
-r($action->getByIdTest($actionIDList[4])) && p('objectType,objectId,action,comment') && e('project,,changed,这是一个系统日志测试备注5');    // 测试获取动态5的信息
\ No newline at end of file
+r($action->getByIdTest($actionIDList[4])) && p('objectType,objectId,action,comment') && e('project,,changed,这是一个系统日志测试备注5');    // 测试获取动态5的信息
+$yaml->restoreTable('action', 'action');

From 5db92a2dad935ba9fee923b6df87d7c94e44b0b3 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, 16 Nov 2022 13:51:46 +0800
Subject: [PATCH 014/129]  * fix bug #29648.

---
 module/project/js/create.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/js/create.js b/module/project/js/create.js
index 502b08126f..8f8dfa19e7 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -163,6 +163,7 @@ function setParentProgram(parentProgram)
                 $(this).find('[name^=products]').attr('name', 'products[' + index + ']').attr('id', 'products' + index).attr('data-branch', selectedBranch).attr('data-plan', selectedPlan);
                 $(this).find('[name^=products]').val(selectedProduct).chosen().change();
             });
+            $('#productsBox .row .col-sm-4:last').find('.input-group').append($('#productsBox .addProduct .input-group:first .input-group-addon').prop('outerHTML'));
         }
 
         if(parentProgram != 0)

From 8370d27ee446406da1c514624768ee8f082d1691 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 16 Nov 2022 08:24:12 +0000
Subject: [PATCH 015/129] * Fix feedback#1231

---
 module/user/css/batchcreate.css       |  3 ++
 module/user/js/batchcreate.js         | 52 +++++++++++++++++++++++++++
 module/user/model.php                 | 26 ++++++++++++--
 module/user/view/batchcreate.html.php | 10 ++++++
 4 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css
index 6a5695e048..f3edda60aa 100644
--- a/module/user/css/batchcreate.css
+++ b/module/user/css/batchcreate.css
@@ -4,3 +4,6 @@ td .passwordBox {border-left-width: 0px!important;}
 .c-id {width: 40px;}
 .c-realname, .c-visions {width: 130px;}
 .c-dept, .c-role, .c-group, .c-commiter, .c-join, .c-contact {width: 120px;}
+.c-company {width: 210px;}
+
+.user-type{margin: 8px 0px 0px 8px; float: left;}
diff --git a/module/user/js/batchcreate.js b/module/user/js/batchcreate.js
index 600d327709..ac36a2a3d3 100644
--- a/module/user/js/batchcreate.js
+++ b/module/user/js/batchcreate.js
@@ -186,3 +186,55 @@ $(document).on('change', "select[id^='visions']", function()
         }(n)));
     }
 });
+
+/**
+ * Show or hide companies based on user type.
+ *
+ * @param  type $type
+ * @access public
+ * @return void
+ */
+function changeType(type)
+{
+    if(type == 'inside')
+    {
+        $('#companyBox').addClass('hide');
+        $('select[id^=dept], input[id^=join]').closest('td').removeClass('hide');
+        $('select[id^=company]').closest('td').addClass('hide');
+        $('th.c-dept, th.c-join').removeClass('hide');
+        $('th.c-company').addClass('hide');
+    }
+    else
+    {
+        $('#companyBox').removeClass('hide');
+        $('select[id^=dept], input[id^=join]').closest('td').addClass('hide');
+        $('select[id^=company]').closest('td').removeClass('hide');
+        $('th.c-dept, th.c-join').addClass('hide');
+        $('th.c-company').removeClass('hide');
+    }
+    $('#userType').val(type);
+}
+
+$(function()
+{
+    $(":checkbox[name^='new']").change(function()
+    {
+        var companyNode     = $(this).prop('checked') ? $(this).closest('span').prevAll('select') : $(this).closest('span').prevAll('input');
+        var companyNodeID   = $(companyNode).attr('id');
+        var companyNodeName = $(companyNode).attr('name');
+
+        if($(this).prop('checked'))
+        {
+            $(companyNode).replaceWith("<input name='" + companyNodeName + "' id='" + companyNodeID + "' class='form-control'/>");
+            $('#' + companyNodeID + '_chosen').remove();
+        }
+        else
+        {
+            var i        = companyNodeID.replace(/[^0-9]/ig, '');
+            var dataHtml = $(companies).attr('id', companyNodeID).attr('name', companyNodeName).prop('outerHTML');
+            $('#' + companyNodeID).replaceWith(dataHtml);
+            if(i == 1) $('#' + companyNodeID).find('option[value="ditto"]').remove();
+            $('#' + companyNodeID).chosen();
+        }
+    })
+});
diff --git a/module/user/model.php b/module/user/model.php
index 0f6acebe7c..12626b46c3 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -425,9 +425,19 @@ class userModel extends model
                 }
 
                 $data[$i] = new stdclass();
-                $data[$i]->dept     = $users->dept[$i] == 'ditto' ? (isset($prev['dept']) ? $prev['dept'] : 0) : $users->dept[$i];
+                if($users->userType == 'outside')
+                {
+                    $data[$i]->company    = $users->company[$i] == 'ditto' ? (isset($prev['company']) ? $prev['company'] : 0) : $users->company[$i];
+                    $data[$i]->newCompany = isset($users->new[$i]) ? true : false;
+                    $data[$i]->type       = 'outside';
+                }
+                else
+                {
+                    $data[$i]->dept = $users->dept[$i] == 'ditto' ? (isset($prev['dept']) ? $prev['dept'] : 0) : $users->dept[$i];
+                    $data[$i]->join = empty($users->join[$i]) ? '0000-00-00' : ($users->join[$i]);
+                    $data[$i]->type = 'inside';
+                }
                 $data[$i]->account  = $users->account[$i];
-                $data[$i]->type     = 'inside';
                 $data[$i]->realname = $users->realname[$i];
                 $data[$i]->role     = $role;
                 $data[$i]->group    = in_array('ditto', isset($users->group[$i]) ? $users->group[$i] : array()) ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i];
@@ -435,7 +445,6 @@ class userModel extends model
                 $data[$i]->gender   = $users->gender[$i];
                 $data[$i]->password = md5(trim($users->password[$i]));
                 $data[$i]->commiter = $users->commiter[$i];
-                $data[$i]->join     = empty($users->join[$i]) ? '0000-00-00' : ($users->join[$i]);
                 $data[$i]->skype    = $users->skype[$i];
                 $data[$i]->qq       = $users->qq[$i];
                 $data[$i]->dingding = $users->dingding[$i];
@@ -474,6 +483,7 @@ class userModel extends model
                 }
 
                 $accounts[$i]     = $data[$i]->account;
+                $prev['company']  = $data[$i]->company;
                 $prev['dept']     = $data[$i]->dept;
                 $prev['role']     = $data[$i]->role;
                 $prev['group']    = $data[$i]->group;
@@ -486,6 +496,16 @@ class userModel extends model
         $userIDList = array();
         foreach($data as $user)
         {
+            if($user->type == 'outside' and $user->newCompany)
+            {
+                $company = new stdClass();
+                $company->name = $user->company;
+                $this->dao->insert(TABLE_COMPANY)->data($company)->exec();
+
+                $user->company = $this->dao->lastInsertID();
+            }
+            unset($user->newCompany);
+
             if(is_array($user->group))
             {
                 foreach($user->group as $group)
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 422d385075..2eb957bc8b 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -13,9 +13,11 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::import($jsRoot . 'md5.js');?>
 <?php js::set('roleGroup', $roleGroup);?>
+<?php js::set('companies', html::select("company", $companies));?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
     <h2><?php echo $lang->user->batchCreate;?></h2>
+    <div class="user-type"><?php echo html::radio('type', $lang->user->typeList , 'inside', "onclick='changeType(this.value)'");?></div>
     <div class="pull-right btn-toolbar">
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=user&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
@@ -42,11 +44,13 @@
   $showVisionList = count($visionList) > 1;
   ?>
   <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+    <?php echo html::hidden('userType', 'inside');?>
     <div class="table-responsive">
       <table class="table table-form">
         <thead>
           <tr class='text-center'>
             <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='c-company hide<?php echo zget($requiredFields, 'company', '', ' required');?>'><?php echo $lang->user->company;?></th>
             <th class='c-dept<?php echo zget($visibleFields, 'dept', ' hidden') . zget($requiredFields, 'dept', '', ' required');?>'>              <?php echo $lang->user->dept;?></th>
             <th class='accountThWidth required'><?php echo $lang->user->account;?></th>
             <th class='c-realname required'><?php echo $lang->user->realname;?></th>
@@ -80,6 +84,12 @@
         <?php for($i = 1; $i <= $config->user->batchCreate; $i++):?>
         <tr class='text-center'>
           <td><?php echo $i;?></td>
+          <td class='text-left hide' style='overflow:visible'>
+            <div class='input-group'>
+              <?php echo html::select("company[$i]", $companies, $i > 1 ? 'ditto' : '', "class='form-control chosen'");?>
+              <span class='input-group-addon'><?php echo html::checkBox("new[$i]", $lang->company->create);?></span>
+            </div>
+          </td>
           <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 1 ? 'ditto' : $deptID, "class='form-control chosen'");?></td>
           <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' onchange='changeEmail($i)'");?></td>
           <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>

From cdb40c819028a38950bf18affce48fb7ab8c24ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Wed, 16 Nov 2022 16:27:09 +0800
Subject: [PATCH 016/129] * Modify user api bug.

---
 api/v1/entries/user.php | 7 +++++--
 module/user/model.php   | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index d419d970d4..773bf66c44 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -408,8 +408,11 @@ class userEntry extends entry
         $this->setPost('gender', $gender);
 
         $password = $this->request('password', zget($_POST, 'password', ''));
-        $this->setPost('password1', md5($password));
-        $this->setPost('password2', md5($password));
+        if($password)
+        {
+            $this->setPost('password1', md5($password));
+            $this->setPost('password2', md5($password));
+        }
         $this->setPost('verifyPassword', md5($this->app->user->password . $this->app->session->rand));
 
         $control = $this->loadController('user', 'edit');
diff --git a/module/user/model.php b/module/user/model.php
index 0f6acebe7c..de537a6c98 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -547,8 +547,6 @@ class userModel extends model
             ->remove('new, password1, password2, groups,verifyPassword, passwordStrength,passwordLength')
             ->get();
 
-        /* Fix bug for api requests using json. */
-        if($this->app->getViewType() == 'json') $this->post->verifyPassword = md5(md5($this->post->verifyPassword) . $this->session->rand);
         if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand))
         {
             dao::$errors['verifyPassword'][] = $this->lang->user->error->verifyPassword;

From 4692b3e26ee5f36027152d53033f89ff55e276b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Wed, 16 Nov 2022 16:31:03 +0800
Subject: [PATCH 017/129] * Don not check password strength.

---
 api/v1/entries/user.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index 773bf66c44..87782cf8c3 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -412,6 +412,7 @@ class userEntry extends entry
         {
             $this->setPost('password1', md5($password));
             $this->setPost('password2', md5($password));
+            $this->setPost('passwordStrength', 2);
         }
         $this->setPost('verifyPassword', md5($this->app->user->password . $this->app->session->rand));
 

From 4058d33d5d762be83e9aee8ca9e2ccaedc4e5c64 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Wed, 16 Nov 2022 16:46:33 +0800
Subject: [PATCH 018/129] * Fix function of generate test data.

---
 test/lib/init.php             |   1 -
 test/lib/yaml.class.php       | 187 +++++++++++++++++++---------------
 test/model/action/getbyid.php |  15 ++-
 3 files changed, 114 insertions(+), 89 deletions(-)

diff --git a/test/lib/init.php b/test/lib/init.php
index 53aa259cb8..9fed533cd7 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -63,7 +63,6 @@ include $testPath. 'lib/db.class.php';
 include $testPath. 'lib/yaml.class.php';
 include $testPath. 'lib/rest.php';
 $db   = new db();
-$yaml = new yaml();
 
 if(!empty($config->test->account) and !empty($config->test->password) and !empty($config->test->base))
 {
diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index d96e1e90c2..3dfa204431 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -24,14 +24,6 @@
  */
 class field
 {
-    /**
-     * Global config.
-     *
-     * @var object
-     * @access public
-     */
-    public $config;
-
     /**
      * Field Arr.
      *
@@ -48,40 +40,6 @@ class field
      */
     private $field;
 
-    /**
-     * Yaml Dir root.
-     *
-     * @var int
-     * @access public
-     */
-    public $yamlDir;
-
-    /**
-     * __construct function load config.
-     *
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        global $config;
-        $this->config  = $config;
-        $this->yamlDir = dirname(__FILE__, 2) . '/model';
-    }
-
-    /**
-     * Magic method, return fild.
-     *
-     * @param  string    $property_name
-     * @access protected
-     * @return object
-     */
-    public function __get($property_name)
-    {
-        $this->setField($property_name);
-        return $this;
-    }
-
     /**
      * Set yaml field.
      *
@@ -144,7 +102,7 @@ class field
      */
     public function type($type)
     {
-        $this->fieldArr[$this->field]['type'] =  $type;
+        $this->fieldArr[$this->field]['type'] = $type;
         return $this;
     }
 
@@ -157,7 +115,7 @@ class field
      */
     public function format($format)
     {
-        $this->fieldArr[$this->field]['format'] =  $format;
+        $this->fieldArr[$this->field]['format'] = $format;
         return $this;
     }
 
@@ -176,7 +134,7 @@ class field
             return;
         }
 
-        $this->fieldArr[$this->field]['fields'] =  $fields;
+        $this->fieldArr[$this->field]['fields'] = $fields;
         return $this;
     }
 
@@ -188,7 +146,6 @@ class field
      */
     public function getFields()
     {
-        var_dump($this->fieldArr);
         return $this->fieldArr;
     }
 
@@ -226,32 +183,6 @@ class field
 
         return $ruleArr;
     }
-
-    /**
-     * Build yaml file.
-     *
-     * @param  string    $model
-     * @param  string    $name
-     * @param  string    $version
-     * @access public
-     * @return void
-     */
-    public function build($model, $name, $version = '')
-    {
-        if(!is_dir($this->yamlDir . "/{$model}/data")) mkdir($this->yamlDir . "/{$model}/data", 0700);
-        $yamlFile = $this->yamlDir . "/{$model}/data/{$name}.yaml";
-
-        $yamlDataArr = array();
-
-        $yamlDataArr['title']  = "zt_{$name}";
-        $yamlDataArr['author'] = "auto_{$name}";
-        $version ? $yamlDataArr['version'] = $version : $yamlDataArr['version'] = '1.0';
-
-        if(empty($this->fieldArr)) return;
-        $yamlDataArr['fields'] = $this->setFieldRule($this->fieldArr);
-
-        yaml_emit_file($yamlFile, $yamlDataArr, YAML_UTF8_ENCODING);
-    }
 }
 
 /**
@@ -265,21 +196,106 @@ class field
  * @version   1.0
  * @Link      https://www.zentao.net
  */
-class yaml extends field
+class yaml
 {
+    /**
+     * Set fields for yaml file.
+     *
+     * @var int
+     * @access public
+     */
+    public $field;
+
+    /**
+     * Global config.
+     *
+     * @var object
+     * @access public
+     */
+    public $config;
+
+    /**
+     * The generated data table name.
+     *
+     * @var string
+     * @access public
+     */
+    public $tableName;
+
+    /**
+     * __construct function load config and tableName.
+     * @param  string $tableName
+     * @access public
+     * @return void
+     */
+    public function __construct($tableName)
+    {
+        global $config;
+        $this->config    = $config;
+        $this->tableName = $tableName;
+        $this->field     = new field();
+    }
+
+    /**
+     * Magic method, return fild.
+     *
+     * @param  string    $property_name
+     * @access protected
+     * @return object
+     */
+    public function __get($property_name)
+    {
+        $this->field->setField($property_name);
+        return $this->field;
+    }
+
+    /**
+     * Build yaml file and insert table.
+     *
+     * @param  int     $rows
+     * @param  bool    $isDefault
+     * @param  string  $version
+     * @access public
+     * @return void
+     */
+    public function gen($rows, $isDefault = false, $version = '')
+    {
+        $runFileDir  = $_SERVER['PWD'];
+        $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
+
+        if(!is_dir("$runFileDir/data")) mkdir("$runFileDir/data", 0700);
+        $yamlFile = "{$runFileDir}/data/{$this->tableName}_{$runFileName}.yaml";
+
+        $yamlDataArr = array();
+
+        $yamlDataArr['title']  = "zt_{$this->tableName}";
+        $yamlDataArr['author'] = "auto_{$runFileName}";
+        $version ? $yamlDataArr['version'] = $version : $yamlDataArr['version'] = '1.0';
+
+        if(empty($this->field->fieldArr)) return;
+        $yamlDataArr['fields'] = $this->field->setFieldRule($this->field->fieldArr);
+
+        yaml_emit_file($yamlFile, $yamlDataArr, YAML_UTF8_ENCODING);
+
+        $isDefault === true ? $this->insertDB($yamlFile, $this->tableName, $rows, true) : $this->insertDB($yamlFile, $this->tableName, $rows);
+    }
+
     /**
      * Insert the data into database.
      *
-     * @param  string    $model
+     * @param  string    $yamlFile
      * @param  string    $tableName
      * @param  int       $rows
+     * @param  bool      $isDefault
+     * @param  bool      $isClear
      * @access public
      * @return string
      */
-    function insertDB($model, $file, $tableName, $rows, $isClear = false)
+    function insertDB($yamlFile, $tableName, $rows, $isDefault = false, $isClear = true)
     {
-        $yamlFile    = $this->yamlDir . "/{$model}/data/{$file}.yaml";
-        $tableSqlDir = $this->yamlDir . "/{$model}/data/sql";
+        if($isDefault === true) $yamlFile = dirname(dirname(__FILE__)) . "/data/{$tableName}.yaml";
+
+        $tableSqlDir = "{$_SERVER['PWD']}/data/sql";
 
         if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0700);
         $dumpCommand = "mysqldump -u%s -p%s -h%s -P%s %s %s > {$tableSqlDir}/{$tableName}.sql";
@@ -306,14 +322,13 @@ class yaml extends field
     /**
      * Restore table data.
      *
-     * @param  string    $model
      * @param  string    $tableName
      * @access public
      * @return mixed
      */
-    public function restoreTable($model, $tableName)
+    public function restoreTable($tableName)
     {
-        $tableSql = $this->yamlDir . "/{$model}/data/sql/$tableName.sql";
+        $tableSql = "{$_SERVER['PWD']}/data/sql/$tableName.sql";
         if(!is_file($tableSql)) return false;
 
         $dbName = $this->config->db->name;
@@ -327,3 +342,15 @@ class yaml extends field
         system($execRestore);
     }
 }
+
+/**
+ * Return yaml class
+ *
+ * @param  string $table
+ * @access public
+ * @return mixed
+ */
+function zdTable($table)
+{
+    return new yaml($table);
+}
diff --git a/test/model/action/getbyid.php b/test/model/action/getbyid.php
index 35c9d7b48c..3cca080ae1 100755
--- a/test/model/action/getbyid.php
+++ b/test/model/action/getbyid.php
@@ -3,13 +3,13 @@
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/action.class.php';
 su('admin');
-$yaml->id->range('101-105');
-$yaml->objectType->range("product,story,productplan,release");
-$yaml->action->range("common,extra,opened,created,changed");
-$yaml->comment->range("1-5")->prefix("这是一个系统日志测试备注");
-$yaml->getFields();
-$yaml->build('action', 'action_getbyid');
-$yaml->insertDB('action', 'action_getbyid', 'action', 5);
+
+$action = zdTable('action');
+$action->id->range('101-105');
+$action->objectType->range("product,story,productplan,release,project");
+$action->action->range("common,extra,opened,created,changed");
+$action->comment->range("1-5")->prefix("这是一个系统日志测试备注");
+$action->gen(5);
 /**
 
 title=测试 actionModel->getById();
@@ -33,4 +33,3 @@ r($action->getByIdTest($actionIDList[1])) && p('objectType,objectId,action,comme
 r($action->getByIdTest($actionIDList[2])) && p('objectType,objectId,action,comment') && e('productplan,,opened,这是一个系统日志测试备注3'); // 测试获取动态3的信息
 r($action->getByIdTest($actionIDList[3])) && p('objectType,objectId,action,comment') && e('release,,created,这是一个系统日志测试备注4');    // 测试获取动态4的信息
 r($action->getByIdTest($actionIDList[4])) && p('objectType,objectId,action,comment') && e('project,,changed,这是一个系统日志测试备注5');    // 测试获取动态5的信息
-$yaml->restoreTable('action', 'action');

From 75d9b5ceb9ab7a3c234529addfe0506cf91f05c5 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 16 Nov 2022 17:01:58 +0800
Subject: [PATCH 019/129] * Fix bug execution menu

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

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index d9c8aca692..86fbd5789c 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -343,7 +343,7 @@ $lang->execution->menu->view   = array('link' => "$lang->view|execution|grouptas
 if($config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
 
 $lang->execution->menu->storyGroup = array('link' => "{$lang->common->story}|execution|story|executionID=%s",'class' => 'dropdown dropdown-hover', 'subModule' => 'story', 'alias' => 'batchcreate,storykanban');
-$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story,execution', 'alias' => 'storykanban,linkstory');
+$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'storykanban,linkstory');
 $lang->execution->menu->qa         = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc        = array('link' => "{$lang->doc->common}|doc|tableContents|type=execution&objectID=%s", 'subModule' => 'doc');

From f4452f6d041c342df130684f9fcdf77216886f29 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, 16 Nov 2022 17:06:12 +0800
Subject: [PATCH 020/129]  * fix for link story and bug for project release.

---
 module/bug/model.php              | 23 +++++++++++------------
 module/projectrelease/control.php |  7 ++-----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 9d1449e37e..936a3766fe 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1943,7 +1943,7 @@ class bugModel extends model
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
                 ->beginIF($type == 'unresolved')->andWhere('t1.status')->eq('active')->fi()
                 ->beginIF($type == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
-                ->beginIF($build)->andWhere("CONCAT(',', t1.openedBuild, ',') like '%,$build,%'")->fi()
+                ->beginIF($build)->andWhere("FIND_IN_SET($build, t1.openedBuild)")->fi()
                 ->beginIF(!empty($param))->andWhere('t2.path')->like("%,$param,%")->andWhere('t2.deleted')->eq(0)->fi()
                 ->beginIF($excludeBugs)->andWhere('t1.id')->notIN($excludeBugs)->fi()
                 ->orderBy($orderBy)
@@ -1972,11 +1972,8 @@ class bugModel extends model
         $builds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($build)->fetchAll('id');
 
         $executionIdList = array();
-        foreach($builds as $build)
-        {
-            if(empty($build->execution)) continue;
-            $executionIdList[$build->execution] = $build->execution;
-        }
+        foreach($builds as $build) $executionIdList[$build->execution] = empty($build->execution) ? $build->project : $build->execution;
+        $executionIdList = array_unique($executionIdList);
         if(empty($executionIdList)) return array();
 
         $executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll();
@@ -2085,13 +2082,15 @@ class bugModel extends model
      */
     public function getReleaseBugs($buildID, $productID, $branch = 0, $linkedBugs = '', $pager = null)
     {
-        $executions = $this->dao->select('t1.id,t1.begin')->from(TABLE_EXECUTION)->alias('t1')
-            ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.id = t2.execution')
-            ->where('t2.id')->in($buildID)
-            ->fetchAll('id');
+        $builds = $this->dao->select('id,project,execution')->from(TABLE_BUILD)->where('id')->in($buildID)->fetchAll('id');
+        $executionIdList = array();
+        foreach($builds as $build) $executionIdList[] = empty($build->execution) ? $build->project : $build->execution;
+        $executionIdList = array_unique($executionIdList);
+        if(empty($executionIdList)) return array();
 
-        $condition = 'execution NOT ' . helper::dbIN(array_keys($executions));
-        $minBegin  = '';
+        $executions = $this->dao->select('id,begin')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
+        $condition  = 'execution NOT ' . helper::dbIN($executionIdList);
+        $minBegin   = '';
         foreach($executions as $execution)
         {
             if(empty($minBegin) or $minBegin > $execution->begin) $minBegin = $execution->begin;
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 64a5d6b9e9..2d7fa4fb26 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -575,11 +575,8 @@ class projectrelease extends control
         $this->loadModel('search')->setSearchParams($this->config->product->search);
 
         $executionIdList = array();
-        foreach($builds as $build)
-        {
-            if(empty($build->execution)) continue;
-            $executionIdList[$build->execution] = $build->execution;
-        }
+        foreach($builds as $build) $executionIdList[] = empty($build->execution) ? $build->project : $build->execution;
+        $executionIdList = array_unique($executionIdList);
 
         $allStories = array();
         if($browseType == 'bySearch')

From 0fdbf58dc900a0e4f52cd55122126d4e1845e346 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, 16 Nov 2022 17:09:07 +0800
Subject: [PATCH 021/129]  * adjust code.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 936a3766fe..657b2ae145 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1972,7 +1972,7 @@ class bugModel extends model
         $builds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($build)->fetchAll('id');
 
         $executionIdList = array();
-        foreach($builds as $build) $executionIdList[$build->execution] = empty($build->execution) ? $build->project : $build->execution;
+        foreach($builds as $build) $executionIdList[] = empty($build->execution) ? $build->project : $build->execution;
         $executionIdList = array_unique($executionIdList);
         if(empty($executionIdList)) return array();
 

From 40ff070bc92b2cac0587bc4db01d7ebefe84305b Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 16 Nov 2022 09:15:15 +0000
Subject: [PATCH 022/129]  * Fix bug #29652.

---
 extension/lite/execution/ext/control/create.php | 4 ++--
 framework/router.class.php                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/lite/execution/ext/control/create.php b/extension/lite/execution/ext/control/create.php
index cd8f6aed3a..f5f9ffd2f1 100644
--- a/extension/lite/execution/ext/control/create.php
+++ b/extension/lite/execution/ext/control/create.php
@@ -4,7 +4,7 @@ class myExecution extends execution
 {
     public function create($projectID = '', $executionID = 0, $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '')
     {
-        $this->config->execution->create->requiredFields  = 'name,code,begin,end';
+        $this->config->execution->create->requiredFields = 'name,code,begin,end';
         parent::create($projectID, $executionID, $copyExecutionID, $planID, $confirm, $productID, $extra);
     }
-}
\ No newline at end of file
+}
diff --git a/framework/router.class.php b/framework/router.class.php
index 54a15be084..dac06b4ac9 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -181,7 +181,7 @@ class router extends baseRouter
 
         $hourKey = $planKey = $URSR = $URAndSR = 0;
 
-        $mode             = 'new';
+        $mode             = 'ALM';
         $score            = '0';
         $projectKey       = ITERATION_KEY;
         $disabledFeatures = '';
@@ -200,7 +200,7 @@ class router extends baseRouter
         }
 
         /* Lite Version is compatible with classic modes */
-        if($config->vision == 'lite') $mode = 'new';
+        if($config->vision == 'lite') $mode = 'ALM';
 
         /* Record system mode. */
         $config->systemMode = $mode;

From 679f2641aaffe0a1d22ccefa2a9834547d2ae4ae Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 16 Nov 2022 17:19:43 +0800
Subject: [PATCH 023/129] * Fallback code for bug#29896.

---
 module/program/model.php    | 1 -
 module/project/js/create.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index 9d5ff89348..50948a015c 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -88,7 +88,6 @@ class programModel extends model
         $dao = $this->dao->select('id, name, program')->from(TABLE_PRODUCT)
             ->where('deleted')->eq(0)
             ->andWhere('vision')->eq($this->config->vision)
-            ->beginIF($programID !== '')->andWhere('program')->eq($programID)->fi()
             ->beginIF($shadow !== 'all')->andWhere('shadow')->eq((int)$shadow)->fi()
             ->beginIF($mode == 'assign')->andWhere('program')->eq($programID)->fi()
             ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
diff --git a/module/project/js/create.js b/module/project/js/create.js
index 2646ba755d..f140841f41 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -160,10 +160,8 @@ function setParentProgram(parentProgram)
                 var selectedProduct = $(this).find('[name^=products]').val();
                 var selectedBranch  = $(this).find('[name^=branch]').val();
                 var selectedPlan    = $('#plan' + index ).find('[name^=plans]').val();
-                var newProductHtml  = $(this).find('span.input-group-addon');
 
                 $(this).html(productSelectHtml);
-                $(this).append(newProductHtml);
                 $(this).find('[name^=products]').attr('name', 'products[' + index + ']').attr('id', 'products' + index).attr('data-branch', selectedBranch).attr('data-plan', selectedPlan);
                 $(this).find('[name^=products]').val(selectedProduct).chosen().change();
             });

From 9e8cd23ebdb4198707e8349542fce87d8afd7de3 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 08:44:24 +0800
Subject: [PATCH 024/129] * Optimize code.

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

diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index 8e2eb76c43..35b2292286 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -40,7 +40,7 @@ class projectStory extends control
         if($projectID)
         {
             $project = $this->loadModel('project')->getByID($projectID);
-            if(!$project->hasProduct) $productID = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetch('product');
+            if(!$project->hasProduct) $productID = $this->loadModel('product')->getShadowProductByProject($projectID)->id;
         }
 
         $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);

From 617ebf6d8d11cca8a07c20227e29a8c77a4e0760 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 08:45:30 +0800
Subject: [PATCH 025/129] * Fix bug #28841.

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

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index ea2bc86610..0db4bb5372 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -204,7 +204,7 @@
                   <?php echo html::hidden('status', $story->status);?>
                 </td>
               </tr>
-              <?php if(strpos('draft,changing', $story->status) !== false and $story->type == 'story'):?>
+              <?php if(0 and strpos('draft,changing', $story->status) !== false and $story->type == 'story'):?>
               <tr>
                 <th><?php echo $lang->story->stage;?></th>
                 <td>

From 0de7525880e07252d42f47e7cf37b551d729c40b Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 09:05:40 +0800
Subject: [PATCH 026/129] * Fix bug#29716.

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

diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php
index a17fe99ce5..d3c905fec9 100644
--- a/module/projectrelease/view/create.html.php
+++ b/module/projectrelease/view/create.html.php
@@ -26,13 +26,18 @@
             <th><?php echo $lang->release->name;?></th>
             <td><?php echo html::input('name', '', "class='form-control' required");?></td>
             <td>
+              <?php if(!$product->shadow):?>
               <div id='markerBox' class='checkbox-primary'>
                 <input id='marker' name='marker' value='1' type='checkbox' />
                 <label for='marker'><?php echo $lang->release->marker;?></label>
               </div>
+              <?php endif;?>
               <?php if($lastRelease) echo '(' . $lang->release->last . ': ' . $lastRelease->name . ')';?>
             </td>
           </tr>
+          <?php if($product->shadow):?>
+          <?php echo html::hidden('product', $product->id);?>
+          <?php else:?>
           <tr>
             <th><?php echo $lang->release->product;?></th>
             <td>
@@ -43,6 +48,7 @@
             </td>
             <td></td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->release->build;?></th>
             <td id='buildBox'><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple");?></td>

From 101f0844b49e84b69bcc8e5092447b939a3d03b2 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Thu, 17 Nov 2022 09:11:59 +0800
Subject: [PATCH 027/129] * Fix yaml function.

---
 test/lib/yaml.class.php       | 34 ++++++++++++++++++----------------
 test/model/action/getbyid.php |  3 +++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index 3dfa204431..687e869c07 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -22,7 +22,7 @@
  * @version   1.0
  * @Link      https://www.zentao.net
  */
-class field
+class fields
 {
     /**
      * Field Arr.
@@ -126,7 +126,7 @@ class field
      * @access public
      * @return object
      */
-    public function fields($fields)
+    public function setFields($fields)
     {
         if(!is_array($fields))
         {
@@ -204,7 +204,7 @@ class yaml
      * @var int
      * @access public
      */
-    public $field;
+    public $fields;
 
     /**
      * Global config.
@@ -233,7 +233,7 @@ class yaml
         global $config;
         $this->config    = $config;
         $this->tableName = $tableName;
-        $this->field     = new field();
+        $this->fields    = new fields();
     }
 
     /**
@@ -245,20 +245,19 @@ class yaml
      */
     public function __get($property_name)
     {
-        $this->field->setField($property_name);
-        return $this->field;
+        $this->fields->setField($property_name);
+        return $this->fields;
     }
 
     /**
      * Build yaml file and insert table.
      *
      * @param  int     $rows
-     * @param  bool    $isDefault
      * @param  string  $version
      * @access public
      * @return void
      */
-    public function gen($rows, $isDefault = false, $version = '')
+    public function gen($rows, $version = '')
     {
         $runFileDir  = $_SERVER['PWD'];
         $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
@@ -272,12 +271,18 @@ class yaml
         $yamlDataArr['author'] = "auto_{$runFileName}";
         $version ? $yamlDataArr['version'] = $version : $yamlDataArr['version'] = '1.0';
 
-        if(empty($this->field->fieldArr)) return;
-        $yamlDataArr['fields'] = $this->field->setFieldRule($this->field->fieldArr);
+        if(empty($this->fields->fieldArr))
+        {
+            $yamlFile = dirname(dirname(__FILE__)) . "/data/{$this->tableName}.yaml";
+        }
+        else
+        {
+            $yamlDataArr['fields'] = $this->fields->setFieldRule($this->fields->fieldArr);
 
-        yaml_emit_file($yamlFile, $yamlDataArr, YAML_UTF8_ENCODING);
+            yaml_emit_file($yamlFile, $yamlDataArr, YAML_UTF8_ENCODING);
+        }
 
-        $isDefault === true ? $this->insertDB($yamlFile, $this->tableName, $rows, true) : $this->insertDB($yamlFile, $this->tableName, $rows);
+        $this->insertDB($yamlFile, $this->tableName, $rows);
     }
 
     /**
@@ -286,15 +291,12 @@ class yaml
      * @param  string    $yamlFile
      * @param  string    $tableName
      * @param  int       $rows
-     * @param  bool      $isDefault
      * @param  bool      $isClear
      * @access public
      * @return string
      */
-    function insertDB($yamlFile, $tableName, $rows, $isDefault = false, $isClear = true)
+    function insertDB($yamlFile, $tableName, $rows, $isClear = true)
     {
-        if($isDefault === true) $yamlFile = dirname(dirname(__FILE__)) . "/data/{$tableName}.yaml";
-
         $tableSqlDir = "{$_SERVER['PWD']}/data/sql";
 
         if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0700);
diff --git a/test/model/action/getbyid.php b/test/model/action/getbyid.php
index 3cca080ae1..20df22fe78 100755
--- a/test/model/action/getbyid.php
+++ b/test/model/action/getbyid.php
@@ -10,6 +10,9 @@ $action->objectType->range("product,story,productplan,release,project");
 $action->action->range("common,extra,opened,created,changed");
 $action->comment->range("1-5")->prefix("这是一个系统日志测试备注");
 $action->gen(5);
+
+//zdTable('action')->gen(5);
+
 /**
 
 title=测试 actionModel->getById();

From f7506fa050905fe3b804ef81a92e0d67dd478379 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 17 Nov 2022 09:23:02 +0800
Subject: [PATCH 028/129] * Fix task #76408

---
 module/story/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/story/control.php b/module/story/control.php
index a9beabac45..1f16da235e 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -972,6 +972,7 @@ class story extends control
             $project = $this->dao->findByID($executionID)->from(TABLE_PROJECT)->fetch();
             if($project->type == 'project')
             {
+                if(!($project->model == 'scrum' and !$project->hasProduct and $project->multiple)) $this->view->hiddenPlan = true;
                 $this->project->setMenu($executionID);
             }
             else

From 3a0d499acfe73f7c15e50b98a48c75bb141027ad Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 09:28:31 +0800
Subject: [PATCH 029/129] * Fix bug#29831.

---
 module/design/control.php          | 3 +++
 module/design/view/browse.html.php | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/design/control.php b/module/design/control.php
index 9a78f85dc4..4e371238de 100755
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -115,6 +115,9 @@ class design extends control
         $pager   = pager::init(0, $recPerPage, $pageID);
         $designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager);
 
+        $project = $this->loadModel('project')->getByID($projectID);
+        $this->view->hiddenProduct = $project->hasProduct ? false : true;
+
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->browse;
         $this->view->position[] = $this->lang->design->browse;
 
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index 495122acb6..ec4b2db71a 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -32,9 +32,9 @@
       <?php $vars = "projectID=$projectID&productID=$productID&type=$type&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
         <thead>
           <tr>
-            <th class="text-left w-60px">    <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
-            <th class="text-left">           <?php common::printOrderLink('name',        $orderBy, $vars, $lang->design->name);?></th>
-            <th class="text-left w-150px">   <?php common::printOrderLink('product',     $orderBy, $vars, $lang->design->product);?></th>
+            <th class="text-left w-60px"> <?php common::printOrderLink('id',   $orderBy, $vars, $lang->idAB);?></th>
+            <th class="text-left">        <?php common::printOrderLink('name', $orderBy, $vars, $lang->design->name);?></th>
+            <th class="text-left w-150px <?php echo $hiddenProduct ? 'hidden' : '';?>"><?php common::printOrderLink('product', $orderBy, $vars, $lang->design->product);?></th>
             <th class="text-left w-100px">   <?php common::printOrderLink('type',        $orderBy, $vars, $lang->design->type);?></th>
             <th class="c-assignedTo w-120px"><?php common::printOrderLink('assignedTo',  $orderBy, $vars, $lang->design->assignedTo);?></th>
             <th class="text-left w-120px">   <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->design->createdByAB);?></th>
@@ -47,7 +47,7 @@
           <tr>
             <td calss="c-id">         <?php printf('%03d', $design->id);?></td>
             <td class="c-name" title="<?php echo $design->name;?>"><?php echo common::hasPriv('design', 'view') ? html::a($this->createLink('design', 'view', "id={$design->id}"), $design->name) : $design->name;?></td>
-            <td class="c-product">    <?php echo zget($products, $design->product);?></td>
+            <td class="c-product <?php echo $hiddenProduct ? 'hidden' : '';?>"><?php echo zget($products, $design->product);?></td>
             <td class="c-type">       <?php echo zget($lang->design->typeList, $design->type);?></td>
             <td class="c-assignedTo"> <?php echo $this->design->printAssignedHtml($design, $users);?></td>
             <td class="c-createdBy">  <?php echo zget($users, $design->createdBy);?></td>

From 6c0a92fa653a22879ff0a9ca6c1d982aa8c3f7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 17 Nov 2022 09:40:51 +0800
Subject: [PATCH 030/129]  * adjust for sync build to release.

---
 module/bug/model.php     | 73 +++++++++++++++++++++++++++-------------
 module/release/model.php |  9 ++++-
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 657b2ae145..a4f3f48f17 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1959,21 +1959,17 @@ class bugModel extends model
     /**
      * Get product left bugs.
      *
-     * @param  int    $build
-     * @param  int    $productID
-     * @param  int    $branch
-     * @param  string $linkedBugs
-     * @param  object $pager
+     * @param  int|string $buildIdList
+     * @param  int        $productID
+     * @param  int        $branch
+     * @param  string     $linkedBugs
+     * @param  object     $pager
      * @access public
      * @return array
      */
-    public function getProductLeftBugs($build, $productID, $branch = '', $linkedBugs = '', $pager = null)
+    public function getProductLeftBugs($buildIdList, $productID, $branch = '', $linkedBugs = '', $pager = null)
     {
-        $builds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($build)->fetchAll('id');
-
-        $executionIdList = array();
-        foreach($builds as $build) $executionIdList[] = empty($build->execution) ? $build->project : $build->execution;
-        $executionIdList = array_unique($executionIdList);
+        $executionIdList = $this->getLinkedExecutionByIdList($buildIdList);
         if(empty($executionIdList)) return array();
 
         $executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll();
@@ -2072,29 +2068,26 @@ class bugModel extends model
     /**
      * Get bugs according to buildID and productID.
      *
-     * @param  int    $buildID
-     * @param  int    $productID
-     * @param  string $branch
-     * @param  string $linkedBugs
-     * @param  object $pager
+     * @param  int|string $buildIdList
+     * @param  int        $productID
+     * @param  string     $branch
+     * @param  string     $linkedBugs
+     * @param  object     $pager
      * @access public
      * @return array
      */
-    public function getReleaseBugs($buildID, $productID, $branch = 0, $linkedBugs = '', $pager = null)
+    public function getReleaseBugs($buildIdList, $productID, $branch = 0, $linkedBugs = '', $pager = null)
     {
-        $builds = $this->dao->select('id,project,execution')->from(TABLE_BUILD)->where('id')->in($buildID)->fetchAll('id');
-        $executionIdList = array();
-        foreach($builds as $build) $executionIdList[] = empty($build->execution) ? $build->project : $build->execution;
-        $executionIdList = array_unique($executionIdList);
+        $executionIdList = $this->getLinkedExecutionByIdList($buildIdList);
         if(empty($executionIdList)) return array();
 
-        $executions = $this->dao->select('id,begin')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
+        $executions = $this->dao->select('id,type,begin')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
         $condition  = 'execution NOT ' . helper::dbIN($executionIdList);
         $minBegin   = '';
         foreach($executions as $execution)
         {
             if(empty($minBegin) or $minBegin > $execution->begin) $minBegin = $execution->begin;
-            $condition .= " OR (execution = '{$execution->id}' AND openedDate < '{$execution->begin}')";
+            $condition .= " OR (`execution` = '{$execution->id}' AND openedDate < '{$execution->begin}')";
         }
 
         $bugs = $this->dao->select('*')->from(TABLE_BUG)
@@ -2107,10 +2100,42 @@ class bugModel extends model
             ->andWhere('deleted')->eq(0)
             ->orderBy('openedDate ASC')
             ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id');
         return $bugs;
     }
 
+    /**
+     * Get linked execution by build id list.
+     *
+     * @param  string $buildIdList
+     * @access public
+     * @return array
+     */
+    public function getLinkedExecutionByIdList($buildIdList)
+    {
+        $builds = $this->dao->select('id,execution')->from(TABLE_BUILD)->where('id')->in($buildIdList)->fetchAll('id');
+
+        $executionIdList   = array();
+        $linkedBuildIdList = array();
+        foreach($builds as $build)
+        {
+            if($build->builds) $linkedBuildIdList = array_merge($linkedBuildIdList, explode(',', $build->builds));
+
+            if(empty($build->execution)) continue;
+            $executionIdList[$build->execution] = $build->execution;
+        }
+        if($linkedBuildIdList)
+        {
+            $linkedBuilds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in(array_unique($linkedBuildIdList))->fetchAll('id');
+            foreach($linkedBuilds as $build)
+            {
+                if(empty($build->execution)) continue;
+                $executionIdList[$build->execution] = $build->execution;
+            }
+        }
+        return $executionIdList;
+    }
+
     /**
      * Get bugs of a story.
      *
diff --git a/module/release/model.php b/module/release/model.php
index 92d8aaa8d4..387c6eb131 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -168,6 +168,8 @@ class releaseModel extends model
         $release = fixer::input('post')
             ->add('product', (int)$productID)
             ->add('branch',  (int)$branch)
+            ->add('stories', '')
+            ->add('bugs',    '')
             ->setIF($projectID, 'project', $projectID)
             ->setIF($this->post->build == false, 'build', 0)
             ->setDefault('stories', '')
@@ -224,7 +226,7 @@ class releaseModel extends model
 
         if($release->build)
         {
-            $builds = $this->dao->select('project, branch, stories, bugs')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll();
+            $builds = $this->dao->select('id,project,branch,stories,bugs')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id');
             foreach($builds as $build)
             {
                 $branches[$build->branch]  = $build->branch;
@@ -238,6 +240,11 @@ class releaseModel extends model
                     if($build->bugs)    $release->bugs    .= ',' . $build->bugs;
                 }
             }
+            if($this->post->sync == 'true' and $release->bugs)
+            {
+                $releaseBugs   = $this->loadModel('bug')->getReleaseBugs(array_keys($builds), $release->product, $release->branch);
+                $release->bugs = join(',', array_intersect(explode(',', $release->bugs), array_keys($releaseBugs)));
+            }
 
             $release->build   = ',' . trim($release->build, ',') . ',';
             $release->branch  = ',' . trim(implode(',', $branches), ',') . ',';

From 5de7f127294794a5b87b6d1e77db592f09c0628f Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 09:57:15 +0800
Subject: [PATCH 031/129] * Fix bug #29817.

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

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 6400849538..155449efde 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -24,7 +24,7 @@
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
 
-#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
+div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
 #gray-line {width:230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
 </style>
 <?php

From f08a8ccf92e30ad52aff552b3c73b769377ee10c Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 10:01:34 +0800
Subject: [PATCH 032/129] * Remove story stage for edit.

---
 module/story/view/edit.html.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 0db4bb5372..96697c0fab 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -204,26 +204,6 @@
                   <?php echo html::hidden('status', $story->status);?>
                 </td>
               </tr>
-              <?php if(0 and strpos('draft,changing', $story->status) !== false and $story->type == 'story'):?>
-              <tr>
-                <th><?php echo $lang->story->stage;?></th>
-                <td>
-                <?php
-                if($story->stages and $branchTagOption)
-                {
-                    foreach($story->stages as $branch => $stage)
-                    {
-                        if(isset($branchTagOption[$branch])) echo '<p>' . $branchTagOption[$branch] . html::select("stages[$branch]", $lang->story->stageList, $stage, "class='form-control chosen'") . '</p>';
-                    }
-                }
-                else
-                {
-                    echo html::select('stage', $lang->story->stageList, $story->stage, "class='form-control chosen'");
-                }
-                ?>
-                </td>
-              </tr>
-              <?php endif;?>
               <tr>
                 <th><?php echo $lang->story->category;?></th>
                 <td><?php echo html::select('category', $lang->story->categoryList, $story->category, "class='form-control chosen'");?></td>

From d032dccb9d877d4679cf075fa9a15450d5375b7f Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 17 Nov 2022 02:02:07 +0000
Subject: [PATCH 033/129]  * Fix bug #29658.

---
 .../lite/product/ext/view/browse.html.php     | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php
index 524ca6c491..898cc404f8 100644
--- a/extension/lite/product/ext/view/browse.html.php
+++ b/extension/lite/product/ext/view/browse.html.php
@@ -20,22 +20,25 @@ body {margin-bottom: 25px;}
 .assignedTo{border-radius: 4px !important;}
 #productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
 </style>
-<?php js::set('browseType', $browseType);?>
-<?php js::set('productID', $productID);?>
-<?php js::set('projectID', $projectID);?>
-<?php js::set('branch', $branch);?>
-<?php js::set('rawModule', $this->app->rawModule);?>
-<?php js::set('productType', $this->app->tab == 'product' ? $product->type : '');?>
 <?php
-$unfoldStories = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array();
-$unfoldStories = zget($unfoldStories, $productID, array());
+$lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement;
+$unfoldStories     = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array();
+$unfoldStories     = zget($unfoldStories, $productID, array());
+$isProjectStory    = $this->app->rawModule == 'projectstory';
+$projectHasProduct = $isProjectStory && !empty($project->hasProduct);
+$projectIDParam    = $isProjectStory ? "projectID=$projectID&" : '';
 js::set('unfoldStories', $unfoldStories);
 js::set('unfoldAll',     $lang->execution->treeLevel['all']);
 js::set('foldAll',       $lang->execution->treeLevel['root']);
 js::set('storyType',     $storyType);
-$lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement;
-$isProjectStory = $this->app->rawModule == 'projectstory';
-$projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
+js::set('browseType', $browseType);
+js::set('productID', $productID);
+js::set('projectID', $projectID);
+js::set('branch', $branch);
+js::set('rawModule', $this->app->rawModule);
+js::set('productType', $this->app->tab == 'product' ? $product->type : '');
+js::set('projectHasProduct', $projectHasProduct);
+js::set('URAndSR', $this->config->URAndSR);
 ?>
 <style>
 .btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}

From 34b19111044224c3c33649be3064fc2ed4739df0 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 02:03:43 +0000
Subject: [PATCH 034/129] * Fix bug #29639.

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

diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index 495122acb6..858d5df2f8 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -55,9 +55,9 @@
             <td class='c-actions text-center'>
               <?php
               $vars = "design={$design->id}";
-              common::printIcon('design', 'edit',       $vars, $design, 'list', 'alter');
-              common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
-              common::printIcon('design', 'delete',     $vars, $design, 'list', 'trash', 'hiddenwin');
+              common::printIcon('design', 'edit',   $vars, $design, 'list', 'alter');
+              if(helper::hasFeature('devops')) common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
+              common::printIcon('design', 'delete', $vars, $design, 'list', 'trash', 'hiddenwin');
               ?>
             </td>
           </tr>

From 6b7b4ae6c2ca34ff17b8035421f552cae96911d1 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 17 Nov 2022 10:06:22 +0800
Subject: [PATCH 035/129] * Fix task #76409

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

diff --git a/module/execution/js/all.js b/module/execution/js/all.js
index 3f7384f54a..c2b21b9a93 100644
--- a/module/execution/js/all.js
+++ b/module/execution/js/all.js
@@ -12,6 +12,8 @@ $(function()
         e.preventDefault();
     });
 
+    if($('#executionList thead th.c-name').width() < 260) $('#executionList thead th.c-name').width(260);
+
     $('#executionTableList').on('sort.sortable', function(e, data)
     {
         var list = '';

From 911a809057f9414845543633d89a88194913f2da Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 02:09:17 +0000
Subject: [PATCH 036/129] * Fix bug #29636.

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

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 91b29a8998..a921fc80e6 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -571,7 +571,7 @@
                     </ul>
                   </td>
                 </tr>
-                <?php if($story->type == 'story'):?>
+                <?php if($story->type == 'story' && helper::hasFeature('devops')):?>
                 <tr>
                   <th><?php echo $lang->story->linkMR;?></th>
                   <td class='pd-0'>

From 2a780454cf4438f17c37b615429435059b7badcc Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 02:14:31 +0000
Subject: [PATCH 037/129] * Optimize code.

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

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index a921fc80e6..57b9400353 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -415,7 +415,7 @@
     <div class="cell">
       <div class='tabs'>
         <ul class='nav nav-tabs'>
-          <?php if($this->config->URAndSR && !$hiddenURS):?>
+          <?php if($this->config->URAndSR and !$hiddenURS):?>
           <li class='active'><a href='#legendStories' data-toggle='tab'><?php echo $story->type == 'story' ? $lang->story->requirement : $lang->story->story;?></a></li>
           <?php endif;?>
           <?php if($story->type == 'story'):?>
@@ -424,7 +424,7 @@
           <li><a href='#legendRelated' data-toggle='tab'><?php echo $lang->story->legendRelated;?></a></li>
         </ul>
         <div class='tab-content'>
-          <?php if($this->config->URAndSR && !$hiddenURS):?>
+          <?php if($this->config->URAndSR and !$hiddenURS):?>
           <div class='tab-pane active' id='legendStories'>
             <ul class="list-unstyled">
               <?php
@@ -571,7 +571,7 @@
                     </ul>
                   </td>
                 </tr>
-                <?php if($story->type == 'story' && helper::hasFeature('devops')):?>
+                <?php if($story->type == 'story' and helper::hasFeature('devops')):?>
                 <tr>
                   <th><?php echo $lang->story->linkMR;?></th>
                   <td class='pd-0'>

From 362580122f6eb8b014c919543bfb35d284b3a17f Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 02:17:51 +0000
Subject: [PATCH 038/129] * Fix bug #29929.

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

diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php
index dbc184007a..b8d39d5291 100644
--- a/module/product/view/dashboard.html.php
+++ b/module/product/view/dashboard.html.php
@@ -15,7 +15,7 @@
 <div id='mainContent' class="main-row">
   <div class="col-12 main-col">
     <div class="row">
-    <?php $isRoadmap = common::hasPriv('product', 'roadmap');?>
+    <?php $isRoadmap = (common::hasPriv('product', 'roadmap') and helper::hasFeature('product_roadmap'));?>
     <?php if($isRoadmap):?>
       <div class="col-sm-6">
         <div class="panel block-release">

From 4a7b338badfe0e6bd80c76849af4f32cef596583 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 10:36:25 +0800
Subject: [PATCH 039/129] * Fix bug#29430.

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

diff --git a/module/project/model.php b/module/project/model.php
index b5d90b1f05..abcddce833 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -3003,7 +3003,7 @@ class projectModel extends model
                 $menu .= "<div class='btn-group'>";
                 $menu .= "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-ellipsis-v'></i></button>";
                 $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                $menu .= $this->buildMenu($moduleName, 'manageProducts', $params . "&from={$this->app->tab}", $project, 'browse', 'link', '', 'btn-action', '', '', $this->lang->project->manageProducts);
+                if($project->hasProduct) $menu .= $this->buildMenu($moduleName, 'manageProducts', $params . "&from={$this->app->tab}", $project, 'browse', 'link', '', 'btn-action', '', '', $this->lang->project->manageProducts);
                 $menu .= $this->buildMenu('project', 'whitelist', "$params&module=project&from=$from", $project, 'browse', 'shield-check', '', 'btn-action', '', $dataApp);
                 $menu .= $this->buildMenu($moduleName, "delete", $params, $project, 'browse', 'trash', 'hiddenwin', 'btn-action');
                 $menu .= "</ul>";

From 17602d5113ad0d5a842553582a6c8bfc36486587 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 02:38:27 +0000
Subject: [PATCH 040/129] * Fix bug #29924.

---
 module/upgrade/css/to18guide.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css
index dca9e0ac0d..b8c8444fb3 100644
--- a/module/upgrade/css/to18guide.css
+++ b/module/upgrade/css/to18guide.css
@@ -9,8 +9,7 @@
 #mainContent tr th {background-color: rgb(241, 241, 241);}
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
-#useLight {background-color: #ddd!important; padding: 6px 85px;}
-#useALM {background-color: #ddd!important; padding: 6px 85px;}
+#useLight, #useALM {border: #93969b 1px solid; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
 .container {padding-top: 20px;}

From 6039c833a27e88f9795cb6ef2909252af2fcf3fb Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 11:02:07 +0800
Subject: [PATCH 041/129] * Fix bug#29909.

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

diff --git a/module/story/control.php b/module/story/control.php
index 1f16da235e..3c5c2956d5 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2714,7 +2714,7 @@ class story extends control
         $this->story->replaceURLang($storyType);
 
         $this->products = $this->product->getPairs('', 0, '', 'all');
-        if($this->app->tab == 'project')
+        if(strpos('project,execution', $this->app->tab) !== false)
         {
             $project = $this->dao->findByID($projectID)->from(TABLE_PROJECT)->fetch();
             if($project->type == 'project')

From df629b33bfd441aad3bb16b0835d7b5727267fa9 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 11:08:59 +0800
Subject: [PATCH 042/129] * Fix bug#29940.

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

diff --git a/module/story/model.php b/module/story/model.php
index 1034178962..81a760f001 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4944,6 +4944,9 @@ class storyModel extends model
             case 'assignedDate':
                 echo helper::isZeroDate($story->assignedDate) ? '' : substr($story->assignedDate, 5, 11);
                 break;
+            case 'activatedDate':
+                echo helper::isZeroDate($story->activatedDate) ? '' : substr($story->activatedDate, 5, 11);
+                break;
             case 'reviewedBy':
                 echo $story->reviewedBy;
                 break;

From 2b7f25bc6c91d2b461bcafb0a9492dfcee46f086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 17 Nov 2022 11:10:17 +0800
Subject: [PATCH 043/129]  * fix bug #29838.

---
 module/build/js/create.js | 2 +-
 module/build/model.php    | 2 +-
 module/release/model.php  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/build/js/create.js b/module/build/js/create.js
index 836d749f35..24e9448c82 100644
--- a/module/build/js/create.js
+++ b/module/build/js/create.js
@@ -8,7 +8,7 @@ $().ready(function()
     $(document).on('change', '#product, #branch', function()
     {
         var productID = $('#product').val();
-        var branch    = $('#branch').val();
+        var branch    = $('#branch').length > 0 ? $('#branch').val() : '';
         $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,noproject&extra=multiple'), function(data)
         {
             if(data) $('#buildBox').html(data);
diff --git a/module/build/model.php b/module/build/model.php
index 85e09241a4..695656a2f1 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -232,7 +232,7 @@ class buildModel extends model
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on("FIND_IN_SET(t1.id,t3.build)")
             ->leftJoin(TABLE_BRANCH)->alias('t4')->on('t1.branch = t4.id')
             ->leftJoin(TABLE_PRODUCT)->alias('t5')->on('t1.product = t5.id')
-            ->where(1)->eq(1)
+            ->where('1=1')
             ->beginIF(strpos($params, 'hasDeleted') === false)->andWhere('t1.deleted')->eq(0)->fi()
             ->beginIF(strpos($params, 'noproject') !== false)->andWhere('t1.execution')->ne(0)->fi()
             ->beginIF($products)->andWhere('t1.product')->in($products)->fi()
diff --git a/module/release/model.php b/module/release/model.php
index a8ea3e9d24..2f08f19efc 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -168,11 +168,10 @@ class releaseModel extends model
         $release = fixer::input('post')
             ->add('product', (int)$productID)
             ->add('branch',  (int)$branch)
-            ->add('stories', '')
-            ->add('bugs',    '')
             ->setIF($projectID, 'project', $projectID)
             ->setIF($this->post->build == false, 'build', 0)
             ->setDefault('stories', '')
+            ->setDefault('bugs',    '')
             ->setDefault('createdBy',   $this->app->user->account)
             ->setDefault('createdDate', helper::now())
             ->join('build', ',')
@@ -312,6 +311,7 @@ class releaseModel extends model
 
         $release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
             ->add('id', $releaseID)
+            ->setDefault('build',  '')
             ->setDefault('mailto', '')
             ->setDefault('deleteFiles', array())
             ->join('build', ',')

From 0d50c31c0c48da4993c2e0069faa4269c059bc81 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 13:04:52 +0800
Subject: [PATCH 044/129] * Fix bug #29468.

---
 module/project/view/ajaxgetdropmenu.html.php | 2 +-
 module/testcase/control.php                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 155449efde..14a3cbb55f 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -24,7 +24,7 @@
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
 
-div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
+#dropMenu div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
 #gray-line {width:230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
 </style>
 <?php
diff --git a/module/testcase/control.php b/module/testcase/control.php
index bc0c8115f8..749640f8c0 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -322,7 +322,6 @@ class testcase extends control
         {
             $this->loadModel('project')->setMenu($this->session->project);
             $this->app->rawModule = 'qa';
-            $this->lang->project->menu->qa['subMenu']->testcase['subModule'] = 'story';
             $products  = $this->product->getProducts($this->session->project, 'all', '', false);
             $productID = $this->product->saveState($productID, $products);
             $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID);

From 4328c922aa34926161c9ca42d0e6134156a695fd Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Thu, 17 Nov 2022 14:01:25 +0800
Subject: [PATCH 045/129] * Fix year in copyright.

---
 module/misc/lang/de.php    | 2 +-
 module/misc/lang/en.php    | 2 +-
 module/misc/lang/fr.php    | 2 +-
 module/misc/lang/vi.php    | 2 +-
 module/misc/lang/zh-cn.php | 2 +-
 module/misc/lang/zh-tw.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index becf60a744..620c0d9f9d 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "Mobiler Zugriff";
 $lang->misc->noGDLib     = "Bitte benutzen Sie den Browser Ihres Telefons um die Seite <strong>%s</strong> aufzurufen";
-$lang->misc->copyright   = "&copy; 2009 - 2018 <a href='http://easysoft.ltd' target='_blank'>Nature Easy Soft Network Technology Co,LTD</a> Email <a href='mailto:Max@easysoft.ltd'>Max@easysoft.ltd</a>";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easysoft.ltd' target='_blank'>Nature Easy Soft Network Technology Co,LTD</a> Email <a href='mailto:Max@easysoft.ltd'>Max@easysoft.ltd</a>";
 $lang->misc->checkTable  = "Prüfe Datentabellen";
 $lang->misc->needRepair  = "Repariere Datentabellen";
 $lang->misc->repairTable = "Datenbank íst beschädigt. Bitte brüfen und reparieren!";
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 419a88168d..98b516bad7 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "Mobile Access";
 $lang->misc->noGDLib     = "Please visit <strong>%s</strong> in the browser of your phone.";
-$lang->misc->copyright   = "&copy; 2009 - 2019 <a href='https://easycorp.ltd/' target='_blank'>EasyCorp</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easycorp.ltd/' target='_blank'>EasyCorp</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
 $lang->misc->checkTable  = "Check Data Table";
 $lang->misc->needRepair  = "Repair Table";
 $lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index cdf35826b2..6ad3cd0fa1 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "Accès Mobile";
 $lang->misc->noGDLib     = "SVP visitez <strong>%s</strong> via le navigateur de votre smartphone.";
-$lang->misc->copyright   = "&copy; 2009 - 2019 <a href='http://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
 $lang->misc->checkTable  = "Vérifiez les Données de la Table";
 $lang->misc->needRepair  = "Réparer la Table";
 $lang->misc->repairTable = "La Base de Données est peut-être endommagée. Elle a besoin d'être vérifiée et éventuellement réparée !";
diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php
index e0410ae5b5..a374fd8464 100644
--- a/module/misc/lang/vi.php
+++ b/module/misc/lang/vi.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "Mobile Access";
 $lang->misc->noGDLib     = "Please visit <strong>%s</strong> in the browser of your phone.";
-$lang->misc->copyright   = "&copy; 2009 - 2019 <a href='http://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
 $lang->misc->checkTable  = "Check Data Table";
 $lang->misc->needRepair  = "Repair Table";
 $lang->misc->repairTable = "Database table might be damaged due to power outage. Vui lòng check and repair!";
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 1488df05d3..5e03904eb2 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "手机访问";
 $lang->misc->noGDLib     = "请用手机浏览器访问：<strong>%s</strong>";
-$lang->misc->copyright   = "&copy; 2009 - 2018 <a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司</a> 电话：4006-8899-23 Email：<a href='mailto:co@zentao.net'>co@zentao.net</a>  QQ：1492153927";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://www.easycorp.cn' target='_blank'>青岛易软天创网络科技有限公司</a> 电话：4006-8899-23 Email：<a href='mailto:co@zentao.net'>co@zentao.net</a>  QQ：1492153927";
 $lang->misc->checkTable  = "检查修复数据表";
 $lang->misc->needRepair  = "修复表";
 $lang->misc->repairTable = "数据库表可能因为断电原因损坏，需要检查修复！！";
diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php
index 5f3caf9615..3daf3d5f61 100644
--- a/module/misc/lang/zh-tw.php
+++ b/module/misc/lang/zh-tw.php
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "手機訪問";
 $lang->misc->noGDLib     = "請用手機瀏覽器訪問：<strong>%s</strong>";
-$lang->misc->copyright   = "&copy; 2009 - 2018 <a href='http://www.cnezsoft.com' target='_blank'>青島易軟天創網絡科技有限公司</a> 電話：4006-8899-23 Email：<a href='mailto:co@zentao.net'>co@zentao.net</a>  QQ：1492153927";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://www.easycorp.cn' target='_blank'>青島易軟天創網絡科技有限公司</a> 電話：4006-8899-23 Email：<a href='mailto:co@zentao.net'>co@zentao.net</a>  QQ：1492153927";
 $lang->misc->checkTable  = "檢查修復數據表";
 $lang->misc->needRepair  = "修復表";
 $lang->misc->repairTable = "資料庫表可能因為斷電原因損壞，需要檢查修復！！";

From 93a772e01e911def0d74e7735606e6022a47cef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 17 Nov 2022 14:01:09 +0800
Subject: [PATCH 046/129]  * fix bug #29834.

---
 module/project/model.php            | 16 ++++++++++++++++
 module/release/model.php            |  2 +-
 module/release/view/browse.html.php | 12 +++++++++++-
 module/release/view/view.html.php   |  7 ++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index b5d90b1f05..27fd8ce7cd 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1,6 +1,22 @@
 <?php
 class projectModel extends model
 {
+    /**
+     * Check the privilege.
+     *
+     * @param  int    $projectID
+     * @access public
+     * @return bool
+     */
+    public function checkPriv($projectID)
+    {
+        if(empty($projectID)) return false;
+
+        /* If is admin, return true. */
+        if($this->app->user->admin) return true;
+        return (strpos(",{$this->app->user->view->projects},", ",{$projectID},") !== false);
+    }
+
     /**
      * Get Multiple linked products for project.
      *
diff --git a/module/release/model.php b/module/release/model.php
index 2f08f19efc..90f4b12acc 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -66,7 +66,7 @@ class releaseModel extends model
             ->page($pager)
             ->fetchAll();
 
-        $builds = $this->dao->select("t1.id, t1.name, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName")
+        $builds = $this->dao->select("t1.id, t1.name, t1.project, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName")
             ->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->leftJoin(TABLE_BRANCH)->alias('t3')->on('t1.branch = t3.id')
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index c6f0049c4e..86a23ef7bd 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -63,6 +63,10 @@
       </tr>
     </thead>
     <tbody>
+      <?php
+      $this->loadModel('project');
+      $this->loadModel('execution');
+      ?>
       <?php foreach($releases as $release):?>
       <?php $canBeChanged = common::canBeChanged('release', $release);?>
       <?php $buildCount    = count($release->builds);?>
@@ -82,7 +86,13 @@
           <?php if($product->type != 'normal'):?>
           <span class='label label-outline label-badge'><?php echo $build->branchName;?></span>
           <?php endif;?>
-          <?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name);?>
+          <?php
+          $moduleName   = $build->execution ? 'build' : 'projectbuild';
+          $canClickable = false;
+          if($moduleName == 'projectbuild' and $this->project->checkPriv($build->project)) $canClickable = true;
+          if($moduleName == 'build' and $this->execution->checkPriv($build->execution))    $canClickable = true;
+          echo $canClickable ? html::a($this->createLink($moduleName, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'") : $build->name;
+          ?>
         </td>
         <td><?php echo $build->projectName;?></td>
         <?php if($i == 1):?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index bcf319defc..accbb8d1b7 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -356,7 +356,12 @@
                         $buildHtml = array();
                         foreach($release->builds as $build)
                         {
-                            $buildHtml[] = html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");
+                            $moduleName   = $build->execution ? 'build' : 'projectbuild';
+                            $canClickable = false;
+                            if($moduleName == 'projectbuild' and $this->loadModel('project')->checkPriv($build->project)) $canClickable = true;
+                            if($moduleName == 'build' and $this->loadModel('execution')->checkPriv($build->execution))    $canClickable = true;
+
+                            $buildHtml[] = $canClickable ? html::a($this->createLink($moduleName, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'") : $build->name;
                         }
                         echo join($lang->comma, $buildHtml);
                         ?>

From 49f6118bb2f864c8e99f8b10e9f4e1c6e7297290 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Thu, 17 Nov 2022 14:01:46 +0800
Subject: [PATCH 047/129] - Remove useless config items.

---
 module/admin/config.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 197e7da4e2..8fa6c10599 100644
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -1,14 +1,4 @@
 <?php
-$config->url = new stdclass();
-$config->url->community = 'https://www.zentao.net';
-$config->url->ask       = 'https://www.zentao.net/ask-browse.html';
-$config->url->document  = 'https://www.zentao.net/help-book-zentaopmshelp.html';
-$config->url->feedback  = 'https://www.zentao.net/forum-board-1074.html';
-$config->url->faq       = 'https://www.zentao.net/ask-faq.html';
-$config->url->extension = 'https://www.zentao.net/extension-browse.html';
-$config->url->donation  = 'https://www.zentao.net/help-donation.html';
-$config->url->service   = 'https://www.cnezsoft.com/article-browse-1078.html';
-
 $config->admin->apiRoot = 'https://www.zentao.net';
 
 $config->admin->log = new stdclass();

From 9c2bdb208154e1d233e428a4e015e77723a55e84 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 17 Nov 2022 14:04:37 +0800
Subject: [PATCH 048/129] * Fix task #76407

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

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 86fbd5789c..2d117dbc76 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -266,7 +266,7 @@ $lang->waterfall->menu->design     = array('link' => "{$lang->design->common}|de
 $lang->waterfall->menu->qa         = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport');
 $lang->waterfall->menu->doc        = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s");
 $lang->waterfall->menu->devops     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
-$lang->waterfall->menu->build      = array('link' => "{$lang->build->common}|project|build|project=%s");
+$lang->waterfall->menu->build      = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild');
 $lang->waterfall->menu->release    = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
 $lang->waterfall->menu->dynamic    = array('link' => "$lang->dynamic|project|dynamic|project=%s");
 

From 825a67ca8f68eabc66829bde5933fe9275882063 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 17 Nov 2022 06:06:11 +0000
Subject: [PATCH 049/129] * Adjust xuanxuan commit.

---
 xuanxuan/XUANVERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xuanxuan/XUANVERSION b/xuanxuan/XUANVERSION
index b95ebc1a59..15c65ccf5b 100644
--- a/xuanxuan/XUANVERSION
+++ b/xuanxuan/XUANVERSION
@@ -1 +1 @@
-v6.6.0
+a975bd7e7e1fd29bc95ee7b9c5bafdc94a4e9eb0

From 3796966b17f787d84e5f4d52cdd9b51071c91b6f Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Thu, 17 Nov 2022 06:10:46 +0000
Subject: [PATCH 050/129] * fix getBoundingClientRect of undefined.

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

diff --git a/module/index/js/index.js b/module/index/js/index.js
index d46dab6ee4..aba2977080 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -564,7 +564,7 @@
         /* The magic number "111" is the space between dropdown trigger
            btn and the bottom of screen */
         var listStyle = {maxHeight: 'initial', top: moreMenuHeight > 111 ? 111 - moreMenuHeight : ''};
-        if($list[0].getBoundingClientRect)
+        if($list[0] && $list[0].getBoundingClientRect)
         {
             var btnBounding = $list.prev('a')[0].getBoundingClientRect();
             if(btnBounding.height)
@@ -803,7 +803,7 @@ $(function()
     {
         var val        = $searchQuery.val();
         var searchType = changeSearchObject();
-        if(val !== null && val !== "")
+        if(val)
         {
             var isQuickGo = !reg.test(val);
             $dropmenu.toggleClass('show-quick-go', isQuickGo);

From a344340f1c1fb0cf788db275f26e89f65e3d9dc6 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 17 Nov 2022 06:11:54 +0000
Subject: [PATCH 051/129] * Remove the unwanted xuan sql.

---
 db/standard/{zentao18.0.sql => zentao18.0.beta1.sql} | 2 ++
 db/zentao.sql                                        | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename db/standard/{zentao18.0.sql => zentao18.0.beta1.sql} (99%)

diff --git a/db/standard/zentao18.0.sql b/db/standard/zentao18.0.beta1.sql
similarity index 99%
rename from db/standard/zentao18.0.sql
rename to db/standard/zentao18.0.beta1.sql
index cae78ceb4e..c9897d527a 100644
--- a/db/standard/zentao18.0.sql
+++ b/db/standard/zentao18.0.beta1.sql
@@ -1232,6 +1232,8 @@ CREATE TABLE `zt_im_chat` (
   `pinnedMessages` text NOT NULL,
   `mergedChats` text NOT NULL DEFAULT '',
   `adminInvite` enum('0','1') NOT NULL DEFAULT '0',
+  `avatar` text NOT NULL DEFAULT '',
+  `archiveDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
   KEY `gid` (`gid`),
   KEY `name` (`name`),
diff --git a/db/zentao.sql b/db/zentao.sql
index 557a6663ad..31412ef369 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -6407,8 +6407,7 @@ CREATE TABLE IF NOT EXISTS `zt_im_message` (
   KEY `mgid` (`gid`),
   KEY `mcgid` (`cgid`),
   KEY `muser` (`user`),
-  KEY `mtype` (`type`),
-  UNIQUE `unique_msg`(`index`, `cgid`)
+  KEY `mtype` (`type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- DROP TABLE IF EXISTS `zt_im_message_backup`;

From dc998d0082647ca5548afcecf45fdf99cfe670ea Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 17 Nov 2022 14:40:50 +0800
Subject: [PATCH 052/129] * Fix task #76411

---
 module/productplan/view/view.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index d8354e7776..4a7c514fda 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -192,7 +192,7 @@
                 <td class='text-left nobr' title='<?php echo $story->title?>'>
                   <?php
                   if($story->parent > 0) echo "<span class='label label-badge label-light' title={$lang->story->children}>{$lang->story->childrenAB}</span>";
-                  echo html::a($viewLink , $story->title, '', "style='color: $story->color'");
+                  echo html::a($viewLink , $story->title, '', "style='color: $story->color' data-app={$this->app->tab}");
                   ?>
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
@@ -464,7 +464,7 @@
                   <?php endif;?>
                 </td>
                 <td><span class='<?php echo $bug->pri ? "label-pri label-pri-{$bug->pri}" : "";?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', 'data-app="product"');?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "data-app={$this->app->tab}");?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>

From 55947f4fec92d267dd9952171f1dae016f34f773 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 14:49:32 +0800
Subject: [PATCH 053/129] * Fix bug #29428.

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

diff --git a/module/story/control.php b/module/story/control.php
index 1f16da235e..a7e5d7de8d 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2727,10 +2727,11 @@ class story extends control
                 $this->loadModel('execution')->setMenu($projectID);
             }
 
-            if(!$project->hasProduct and !$project->multiple)
+            if(!$project->hasProduct)
             {
                 unset($this->lang->story->report->charts['storysPerProduct']);
-                unset($this->lang->story->report->charts['storysPerPlan']);
+
+                if(!$project->multiple) unset($this->lang->story->report->charts['storysPerPlan']);
             }
         }
         else

From d2771d367bb4744d384c4267b061d9434aa70eab Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 15:15:20 +0800
Subject: [PATCH 054/129] * Fix bug#29941.

---
 module/story/css/batchclose.css       | 2 +-
 module/story/js/batchclose.js         | 6 ------
 module/story/view/batchclose.html.php | 7 +++----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/module/story/css/batchclose.css b/module/story/css/batchclose.css
index 680e3638d9..576dfc65bd 100644
--- a/module/story/css/batchclose.css
+++ b/module/story/css/batchclose.css
@@ -1,5 +1,5 @@
 .c-id {width: 50px;}
-.c-reason {width: 150px;}
+.c-reason {width: 210px;}
 td[id^="duplicateStoryBox"].required:after {top: 6px; right: 2px;}
 td[id^="duplicateStoryBox"] {overflow: visible;}
 td.reasons-td {overflow: visible;}
diff --git a/module/story/js/batchclose.js b/module/story/js/batchclose.js
index bd33321844..7c15a5c040 100755
--- a/module/story/js/batchclose.js
+++ b/module/story/js/batchclose.js
@@ -12,22 +12,16 @@ function setDuplicateAndChild(resolution, storyID)
     {
         $('#childStoryBox' + storyID).hide();
         $('#duplicateStoryBox' + storyID).show();
-        $('#duplicateStoryTitle').show();
-        $('.form-actions').attr('colspan', 6);
     }
     else if(resolution == 'subdivided')
     {
         $('#duplicateStoryBox' + storyID).hide();
         $('#childStoryBox' + storyID).show();
-        $('#duplicateStoryTitle').hide();
-        $('.form-actions').attr('colspan', 5);
     }
     else
     {
         $('#duplicateStoryBox' + storyID).hide();
         $('#childStoryBox' + storyID).hide();
-        $('#duplicateStoryTitle').hide();
-        $('.form-actions').attr('colspan', 5);
     }
 }
 
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index be938128d6..21cf183703 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -28,7 +28,6 @@
         <th class='text-left'><?php echo $lang->story->title;?></th>
         <th class='c-status'><?php echo $lang->story->status;?></th>
         <th class='c-reason'><?php echo $lang->story->closedReason;?></th>
-        <th id='duplicateStoryTitle' class='w-p15' style='display:none;'><?php echo $lang->story->duplicateStory;?></th>
         <th class='w-p30'><?php echo $lang->story->comment;?></th>
       </tr>
     </thead>
@@ -44,15 +43,15 @@
               <td class='pd-0'>
                 <?php echo html::select("closedReasons[$storyID]", $reasonList, 'done', "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 80px'");?>
               </td>
+              <td class='pd-0 w-p60 text-left' id='<?php echo 'duplicateStoryBox' . $storyID;?>' <?php if($story->closedReason != 'duplicate') echo "style='display:none'";?>>
+                <?php echo html::select("duplicateStoryIDList[$storyID]", array('' => '') + $productStoryList[$story->product][$story->branch], $story->duplicateStory ? $story->duplicateStory : '', "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?>
+              </td>
               <td class='pd-0' id='<?php echo 'childStoryBox' . $storyID;?>' <?php if($story->closedReason != 'subdivided') echo "style='display:none'";?>>
               <?php echo html::input("childStoriesIDList[$storyID]", '', "class='form-control' placeholder='{$lang->idAB}'");?>
               </td>
             </tr>
           </table>
         </td>
-        <td class='text-left' id='<?php echo 'duplicateStoryBox' . $storyID;?>' <?php if($story->closedReason != 'duplicate') echo "style='display:none'";?>>
-          <?php echo html::select("duplicateStoryIDList[$storyID]", array('' => '') + $productStoryList[$story->product][$story->branch], $story->duplicateStory ? $story->duplicateStory : '', "class='form-control' placeholder='{$lang->bug->duplicateTip}'");?>
-        </td>
         <td><?php echo html::input("comments[$storyID]", '', "class='form-control'");?></td>
       </tr>
       <?php endforeach;?>

From 0428c7e97307f48a3dbf39372fcdc4e238c0943f Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 17 Nov 2022 15:25:52 +0800
Subject: [PATCH 055/129] * Finish ticket #043.

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

diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php
index c6f0b907f6..eb5de22561 100644
--- a/module/file/view/buildform.html.php
+++ b/module/file/view/buildform.html.php
@@ -3,7 +3,7 @@ $maxUploadSize = strtoupper(ini_get('upload_max_filesize'));
 js::set('dangerExtensions', ',' . $this->config->file->dangers . ',');
 js::set('maxUploadSize', $maxUploadSize);
 ?>
-<div class="file-input-list" data-append-way="before" data-provide="fileInputList" data-each-file-max-size="<?php echo $maxUploadSize; ?>" data-file-size-error="<?php echo sprintf($lang->file->errorFileSize, $maxUploadSize); ?>">
+<div class="file-input-list" data-append-way="before" data-filedName="<?php echo $filesName;?>" data-provide="fileInputList" data-each-file-max-size="<?php echo $maxUploadSize; ?>" data-file-size-error="<?php echo sprintf($lang->file->errorFileSize, $maxUploadSize); ?>">
   <div class="file-input">
     <div class="file-input-edit input-group">
       <div class="input-group-cell"><i class="icon icon-paper-clip text-muted"></i></div>

From 67017be8974928e195dcffdfbaf932a1b4bbbe71 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 17 Nov 2022 15:41:39 +0800
Subject: [PATCH 056/129] * Fix bug#29883.

---
 module/programplan/lang/zh-cn.php | 2 +-
 module/programplan/lang/zh-tw.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index b264ab5e54..167261e1f1 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -102,7 +102,7 @@ $lang->programplan->ganttCustom['delay']        = '是否延期';
 $lang->programplan->ganttCustom['delayDays']    = '延期天数';
 
 $lang->programplan->error                  = new stdclass();
-$lang->programplan->error->percentNumber   = '"工作量比例"必须为数字';
+$lang->programplan->error->percentNumber   = '"工作量占比"必须为数字';
 $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"计划开始时间"';
 $lang->programplan->error->percentOver     = '工作量占比累计不应当超过100%';
 $lang->programplan->error->createdTask     = '已分解任务，不可添加子阶段';
diff --git a/module/programplan/lang/zh-tw.php b/module/programplan/lang/zh-tw.php
index c951235dd4..2eec985e1e 100644
--- a/module/programplan/lang/zh-tw.php
+++ b/module/programplan/lang/zh-tw.php
@@ -72,7 +72,7 @@ $lang->programplan->stageCustom->date = '顯示日期';
 $lang->programplan->stageCustom->task = '顯示任務';
 
 $lang->programplan->error                  = new stdclass();
-$lang->programplan->error->percentNumber   = '"工作量比例"必須為數字';
+$lang->programplan->error->percentNumber   = '"工作量占比"必須為數字';
 $lang->programplan->error->planFinishSmall = '"計劃完成時間"必須大於"計劃開始時間"';
 $lang->programplan->error->percentOver     = '工作量占比累計不應當超過100%';
 $lang->programplan->error->createdTask     = '已分解任務,不可添加子階段';

From e31283d2f97a0b801c36283df27627d530637ce6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 17 Nov 2022 15:47:12 +0800
Subject: [PATCH 057/129] * Modified Obtain the configuration information about
 the workweek.

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

diff --git a/module/holiday/model.php b/module/holiday/model.php
index e43442f049..cfffe7ff23 100644
--- a/module/holiday/model.php
+++ b/module/holiday/model.php
@@ -198,12 +198,13 @@ class holidayModel extends model
     {
         if(empty($begin) or empty($end) or $begin == '0000-00-00' or $end == '0000-00-00') return array();
 
+        $this->app->loadConfig('execution');
         $actualDays = array();
         $currentDay = $begin;
 
         $holidays    = $this->getHolidays($begin, $end);
         $workingDays = $this->getWorkingDays($begin, $end);
-        $weekend     = isset($this->config->project->weekend) ? $this->config->project->weekend : 2;
+        $weekend     = isset($this->config->execution->weekend) ? $this->config->execution->weekend : 2;
 
         $holidaysFlip    = array_flip($holidays);
         $workingDaysFlip = array_flip($workingDays);

From 5233ebd8138755647991457d957834d1948c7099 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Thu, 17 Nov 2022 15:50:55 +0800
Subject: [PATCH 058/129] * Optimize checkSafeFile tips for backup.

---
 module/backup/control.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/backup/control.php b/module/backup/control.php
index e7ab01797e..26713a2d5e 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -337,11 +337,12 @@ class backup extends control
         {
             $this->app->loadLang('extension');
 
-            $search = dirname($this->app->getBasePath()) . DS;
+            $search = $this->app->getBasePath();
             $pos    = strpos($statusFile, $search);
-            if($pos !== false) $statusFile = substr_replace($statusFile, '', $pos, strlen($search));
+            $okFile = $statusFile;
+            if($pos !== false) $okFile = substr_replace($statusFile, '', $pos, strlen($search));
 
-            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile, $statusFile);
+            $this->view->error = sprintf($this->lang->extension->noticeOkFile, $okFile, $statusFile);
             return print($this->display());
         }
 

From 7d80105cff1a5f170186fb36032363a466e34572 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 17 Nov 2022 16:00:46 +0800
Subject: [PATCH 059/129] * Code for bug #29355.

---
 db/standard/zentao17.7.sql | 4 ++--
 db/standard/zentao17.8.sql | 4 ++--
 db/standard/zentao18.0.sql | 4 ++--
 db/update17.6.2.sql        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db/standard/zentao17.7.sql b/db/standard/zentao17.7.sql
index 32e0edfa70..68e0850ff9 100644
--- a/db/standard/zentao17.7.sql
+++ b/db/standard/zentao17.7.sql
@@ -1489,7 +1489,7 @@ CREATE TABLE `zt_kanban` (
   `showWIP` enum('0','1') NOT NULL DEFAULT '1',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `object` varchar(255) NOT NULL,
   `alignment` varchar(10) NOT NULL DEFAULT 'center',
@@ -2187,7 +2187,7 @@ CREATE TABLE `zt_project` (
   `displayCards` smallint(6) NOT NULL DEFAULT '0',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
diff --git a/db/standard/zentao17.8.sql b/db/standard/zentao17.8.sql
index 32e0edfa70..68e0850ff9 100644
--- a/db/standard/zentao17.8.sql
+++ b/db/standard/zentao17.8.sql
@@ -1489,7 +1489,7 @@ CREATE TABLE `zt_kanban` (
   `showWIP` enum('0','1') NOT NULL DEFAULT '1',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `object` varchar(255) NOT NULL,
   `alignment` varchar(10) NOT NULL DEFAULT 'center',
@@ -2187,7 +2187,7 @@ CREATE TABLE `zt_project` (
   `displayCards` smallint(6) NOT NULL DEFAULT '0',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
diff --git a/db/standard/zentao18.0.sql b/db/standard/zentao18.0.sql
index cae78ceb4e..cc7f44fe8d 100644
--- a/db/standard/zentao18.0.sql
+++ b/db/standard/zentao18.0.sql
@@ -1490,7 +1490,7 @@ CREATE TABLE `zt_kanban` (
   `showWIP` enum('0','1') NOT NULL DEFAULT '1',
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `object` varchar(255) NOT NULL,
   `alignment` varchar(10) NOT NULL DEFAULT 'center',
@@ -2192,7 +2192,7 @@ CREATE TABLE `zt_project` (
   `fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
   `multiple` enum('0', '1') NOT NULL DEFAULT '1',
   `colWidth` smallint(4) NOT NULL DEFAULT '264',
-  `minColWidth` smallint(4) NOT NULL DEFAULT '180',
+  `minColWidth` smallint(4) NOT NULL DEFAULT '200',
   `maxColWidth` smallint(4) NOT NULL DEFAULT '384',
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
diff --git a/db/update17.6.2.sql b/db/update17.6.2.sql
index 3217d8b7db..7807d1bbcd 100644
--- a/db/update17.6.2.sql
+++ b/db/update17.6.2.sql
@@ -62,10 +62,10 @@ CREATE TABLE `zt_ticketrelation` (
 
 ALTER TABLE `zt_product` ADD `ticket` varchar(30) NOT NULL AFTER `feedback`;
 ALTER TABLE `zt_kanban` ADD `colWidth` smallint(4) NOT NULL DEFAULT '264' AFTER `fluidBoard`;
-ALTER TABLE `zt_kanban` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '180' AFTER `colWidth`;
+ALTER TABLE `zt_kanban` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '200' AFTER `colWidth`;
 ALTER TABLE `zt_kanban` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '384' AFTER `minColWidth`;
 ALTER TABLE `zt_project` ADD `colWidth` smallint(4) NOT NULL DEFAULT '264' AFTER `fluidBoard`;
-ALTER TABLE `zt_project` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '180' AFTER `colWidth`;
+ALTER TABLE `zt_project` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '200' AFTER `colWidth`;
 ALTER TABLE `zt_project` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '384' AFTER `minColWidth`;
 
 REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', 'global', 'syncProduct', '{"feedback":{},"ticket":{}}');

From 532bef39f38e04fcc22aabcbe6fa6c46604d766a Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 08:03:03 +0000
Subject: [PATCH 060/129] * Finish task #76434.

---
 module/build/control.php           |  7 ++++-
 module/build/js/create.js          | 50 ++++++++++++++++++++++++++++++
 module/build/lang/de.php           |  5 +++
 module/build/lang/en.php           |  5 +++
 module/build/lang/fr.php           |  5 +++
 module/build/lang/zh-cn.php        |  5 +++
 module/build/model.php             | 23 ++++----------
 module/build/view/create.html.php  | 13 ++++++--
 module/common/lang/menu.php        |  2 +-
 module/group/lang/resource.php     |  2 --
 module/product/control.php         | 21 +++++++++++++
 module/project/view/build.html.php |  2 +-
 12 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 0abe7eb54e..14d1f9d9f7 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -54,7 +54,7 @@ class build extends control
 
             if(defined('TUTORIAL')) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true)); // Fix bug #21095.
 
-            $buildID = $this->build->create($executionID, $projectID);
+            $buildID = $this->build->create();
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
 
@@ -72,6 +72,8 @@ class build extends control
         if($this->app->tab == 'project')
         {
             $this->project->setMenu($projectID);
+            $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter');
+            $executionID   = empty($executionID) ? key($executions) : $executionID;
             $productGroups = $this->product->getProducts($projectID);
             $branchGroups  = $this->project->getBranchesByProject($projectID);
             $this->session->set('project', $projectID);
@@ -79,6 +81,7 @@ class build extends control
         elseif($this->app->tab == 'execution')
         {
             $execution     = $this->execution->getByID($executionID);
+            $executions    = $this->execution->getPairs($execution->project);
             $projectID     = $execution->project;
             $productGroups = $this->product->getProducts($executionID);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
@@ -89,6 +92,7 @@ class build extends control
         {
             $execution     = $this->execution->getByID($executionID);
             $projectID     = $execution ? $execution->project : 0;
+            $executions    = $this->execution->getPairs($projectID);
             $productGroups = $this->product->getProducts($executionID);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
         }
@@ -119,6 +123,7 @@ class build extends control
         $this->view->executionID   = $executionID;
         $this->view->products      = $products;
         $this->view->projectID     = $projectID;
+        $this->view->executions    = $executions;
         $this->view->lastBuild     = $this->build->getLast($executionID, $projectID);
         $this->view->productGroups = $productGroups;
         $this->view->users         = $this->user->getPairs('nodeleted|noclosed');
diff --git a/module/build/js/create.js b/module/build/js/create.js
index 24e9448c82..c70dafe3f1 100644
--- a/module/build/js/create.js
+++ b/module/build/js/create.js
@@ -15,5 +15,55 @@ $().ready(function()
             $('#builds').chosen();
         });
     });
+
+    $('input[name=type]').change(function()
+    {
+        if($(this).val() == 'execution')
+        {
+            $('#execution').closest('tr').show();
+            $('#buildBox').closest('tr').hide();
+            loadProducts($('#execution').val());
+        }
+        else
+        {
+            $('#execution').closest('tr').hide();
+            $('#buildBox').closest('tr').show();
+            loadProducts($('#project').val());
+        }
+    });
     $('#product').change();
 });
+
+/**
+ * Load products.
+ *
+ * @param  int $executionID
+ * @access public
+ * @return void
+ */
+function loadProducts(executionID)
+{
+    $('#product').remove();
+    $('#product_chosen').remove();
+    $('#branch').remove();
+    $('#branch_chosen').remove();
+    $('#noProduct').remove();
+    $.get(createLink('product', 'ajaxGetProducts', 'executionID=' + executionID), function(data)
+    {
+        if(data)
+        {
+            if(data.indexOf("required") != -1)
+            {
+                $('#productBox').addClass('required');
+            }
+            else
+            {
+                $('#productBox').removeClass('required');
+            }
+
+            $('#productBox').append(data);
+            $('#product').chosen();
+            loadBranches($("#product").val());
+        }
+    });
+}
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 39f5f213c7..b6987753bd 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -33,6 +33,7 @@ $lang->build->project        = 'Project';
 $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
+$lang->build->type           = 'Type';
 $lang->build->builds         = 'Linked Builds';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Datum';
@@ -73,3 +74,7 @@ $lang->build->action->buildopened = '$date, erstellt von <strong>$actor</strong>
 $lang->backhome = 'zurück';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
+
+$lang->build->typeList = array();
+$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
+$lang->build->typeList['project']   = '项目版本';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index df6d81e8d1..9a1e7727cc 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -34,6 +34,7 @@ $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
 $lang->build->builds         = 'Linked Builds';
+$lang->build->type           = 'Type';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
@@ -73,3 +74,7 @@ $lang->build->action->buildopened = '$date, created by <strong>$actor</strong>,
 $lang->backhome = 'back';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
+
+$lang->build->typeList = array();
+$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
+$lang->build->typeList['project']   = '项目版本';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 30ed628f70..e5e151b4e4 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -33,6 +33,7 @@ $lang->build->project        = 'Project';
 $lang->build->branch         = 'Plateforme/Branche';
 $lang->build->branchName     = '%s';
 $lang->build->execution      = $lang->executionCommon;
+$lang->build->type           = 'Type';
 $lang->build->builds         = 'Linked Builds';
 $lang->build->name           = 'Nom';
 $lang->build->date           = 'Date';
@@ -73,3 +74,7 @@ $lang->build->action->buildopened = '$date, Build <strong>$extra</strong> créé
 $lang->backhome = 'Retour';
 
 $lang->build->featureBar['browse']['all'] = 'Build List';
+
+$lang->build->typeList = array();
+$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
+$lang->build->typeList['project']   = '项目版本';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 0be8d8c8b5..13da7f11b3 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -33,6 +33,7 @@ $lang->build->project        = '所属项目';
 $lang->build->branch         = '平台/分支';
 $lang->build->branchName     = '所属%s';
 $lang->build->execution      = '所属' . $lang->executionCommon;
+$lang->build->type           = '版本类型';
 $lang->build->builds         = '关联版本';
 $lang->build->name           = '名称编号';
 $lang->build->date           = '打包日期';
@@ -71,3 +72,7 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 创建版本 <strong>$extra</strong>。' . "\n";
 
 $lang->backhome = '返回';
+
+$lang->build->typeList = array();
+$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
+$lang->build->typeList['project']   = '项目版本';
diff --git a/module/build/model.php b/module/build/model.php
index 695656a2f1..44791f4da6 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -302,42 +302,31 @@ class buildModel extends model
     /**
      * Create a build
      *
-     * @param  int    $executionID
-     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function create($executionID = 0, $projectID = 0)
+    public function create()
     {
         $build = new stdclass();
         $build->stories = '';
         $build->bugs    = '';
 
-        if($projectID && !$executionID)
-        {
-            $project = $this->loadModel('project')->getByID($projectID);
-            if(!$project->multiple) $executionID = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetch('id');
-        }
-        else if($executionID && !$projectID)
-        {
-            $execution = $this->loadModel('execution')->getByID($executionID);
-            $projectID = $execution->project;
-        }
-
         $build = fixer::input('post')
-            ->setDefault('project', $projectID)
+            ->setDefault('project', 0)
+            ->setDefault('execution', 0)
             ->setDefault('product', 0)
             ->setDefault('branch', 0)
             ->setDefault('builds', '')
             ->cleanInt('product,branch')
-            ->add('execution', $executionID)
             ->add('createdBy', $this->app->user->account)
             ->add('createdDate', helper::now())
             ->stripTags($this->config->build->editor->create['id'], $this->config->allowedTags)
             ->join('builds', ',')
-            ->remove('resolvedBy,allchecker,files,labels,uid')
+            ->remove('resolvedBy,allchecker,files,labels,type,uid')
             ->get();
 
+        if($this->post->type == 'project') $build->execution = 0;
+
         $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_BUILD)->data($build)
             ->autoCheck()
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 6a26488df3..e7b45afe8f 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -19,6 +19,14 @@
     </div>
     <form class='load-indicator main-form form-ajax' id='dataform' method='post' enctype='multipart/form-data'>
       <table class='table table-form'>
+        <tr class="<?php echo ($app->tab == 'project' and !empty($multipleProject)) ? '' : 'hidden';?>">
+          <th><?php echo $lang->build->type;?></th>
+          <td><?php echo html::radio('type', $lang->build->typeList, 'execution');?></td>
+        </tr>
+        <tr class="<?php echo !empty($multipleProject) ? '' : 'hidden';?>">
+          <th><?php echo $lang->executionCommon;?></th>
+          <td><?php echo html::select('execution', $executions, $executionID, "onchange='loadProducts(this.value);' class='form-control chosen' required");?></td>
+        </tr>
         <tr class="<?php echo $hidden;?>">
           <th><?php echo $lang->build->product;?></th>
           <?php if(!empty($products)):?>
@@ -42,13 +50,11 @@
           <?php endif;?>
           <td></td>
         </tr>
-        <?php if($app->tab == 'project' && !empty($multipleProject)):?>
-        <tr>
+        <tr class='hide'>
           <th><?php echo $lang->build->builds;?></th>
           <td id='buildBox'><?php echo html::select('builds[]', array(), '', "class='form-control chosen' multiple");?></td>
           <td><?php echo $lang->build->notice->autoRelation;?></td>
         </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo $lang->build->name;?></th>
           <td><?php echo html::input('name', '', "class='form-control' required");?></td>
@@ -86,6 +92,7 @@
         <tr>
           <td colspan="3" class="text-center form-actions">
             <?php echo html::submitButton();?>
+            <?php echo html::hidden('project', $projectID);?>
             <?php echo html::backButton();?>
           </td>
         </tr>
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 86fbd5789c..2d117dbc76 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -266,7 +266,7 @@ $lang->waterfall->menu->design     = array('link' => "{$lang->design->common}|de
 $lang->waterfall->menu->qa         = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport');
 $lang->waterfall->menu->doc        = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s");
 $lang->waterfall->menu->devops     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
-$lang->waterfall->menu->build      = array('link' => "{$lang->build->common}|project|build|project=%s");
+$lang->waterfall->menu->build      = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild');
 $lang->waterfall->menu->release    = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
 $lang->waterfall->menu->dynamic    = array('link' => "$lang->dynamic|project|dynamic|project=%s");
 
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index f06717998d..f2d23d70cb 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -237,7 +237,6 @@ $lang->project->methodOrder[190] = 'manageRepo';
 
 $lang->resource->projectbuild = new stdclass();
 $lang->resource->projectbuild->browse           = 'browse';
-$lang->resource->projectbuild->create           = 'create';
 $lang->resource->projectbuild->edit             = 'edit';
 $lang->resource->projectbuild->view             = 'view';
 $lang->resource->projectbuild->delete           = 'delete';
@@ -249,7 +248,6 @@ $lang->resource->projectbuild->unlinkBug        = 'unlinkBug';
 $lang->resource->projectbuild->batchUnlinkBug   = 'batchUnlinkBug';
 
 $lang->projectbuild->methodOrder[5]  = 'browse';
-$lang->projectbuild->methodOrder[10] = 'create';
 $lang->projectbuild->methodOrder[15] = 'edit';
 $lang->projectbuild->methodOrder[20] = 'view';
 $lang->projectbuild->methodOrder[25] = 'delete';
diff --git a/module/product/control.php b/module/product/control.php
index 8f701aee51..0a93b24502 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -880,6 +880,27 @@ class product extends control
         $this->display();
     }
 
+    /**
+     * Ajax get products.
+     *
+     * @param  int    $executionID
+     * @access public
+     * @return void
+     */
+    public function ajaxGetProducts($executionID)
+    {
+        $this->loadModel('build');
+        $products = $this->product->getProductPairsByProject($executionID);
+        if(empty($products))
+        {
+            return printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project');
+        }
+        else
+        {
+            return print(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
+        }
+    }
+
     /**
      * AJAX: get projects of a product in html select.
      *
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 82c19cbc1f..817fbd1a37 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -35,7 +35,7 @@
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->execution->byQuery;?></a>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::canModify('project', $project)) common::printLink('projectbuild', 'create', "projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary' id='createBuild'");?>
+    <?php if(common::canModify('project', $project)) common::printLink('build', 'create', "executionID=&productID=&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary' id='createBuild'");?>
   </div>
 </div>
 <div id="mainContent">

From 85a5d00a53cd42b38eb7d6d875aa0f62dedd4440 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 17 Nov 2022 16:03:27 +0800
Subject: [PATCH 061/129] * Fix bug #29947

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

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 5885a10933..eea845b2be 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -150,7 +150,7 @@
               <?php $i++;?>
               <?php endforeach;?>
               <?php endforeach;?>
-              <?php if($division):?>
+              <?php if($project->model == 'scrum' or empty($products)):?>
               <div class='col-sm-4'>
                 <div class="input-group">
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>

From 3ef1c553c4b8dc240efe70a18bee546d2b8e3f1a Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Thu, 17 Nov 2022 16:04:56 +0800
Subject: [PATCH 062/129] * Fix bug #29755.

---
 module/productplan/model.php          | 15 +++++++--------
 module/productplan/view/edit.html.php |  6 +++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 2a73256dac..1f05807b2d 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -531,22 +531,21 @@ class productplanModel extends model
             ->get();
 
         $parentPlan = $this->getByID($plan->parent);
-
+        $futureTime = $this->config->productplan->future;
 
         if($plan->parent > 0)
         {
-            if($parentPlan->begin !== $this->config->productplan->future)
+            if($parentPlan->begin !== $futureTime)
             {
                 if($plan->begin < $parentPlan->begin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $parentPlan->begin);
             }
-            if($parentPlan->end !== $this->config->productplan->future)
+            if($parentPlan->end !== $futureTime)
             {
-                if($plan->end !== $this->config->productplan->future and $plan->end > $parentPlan->end) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $parentPlan->end);
+                if($plan->end !== $futureTime and $plan->end > $parentPlan->end) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $parentPlan->end);
             }
         }
-        elseif($oldPlan->parent == -1 and $plan->begin != $this->config->productplan->future)
+        elseif($oldPlan->parent == -1 and ($plan->begin != $futureTime or $plan->end != $futureTime))
         {
-            $plan->parent = -1;
             $childPlans   = $this->getChildren($planID);
             $minBegin     = $plan->begin;
             $maxEnd       = $plan->end;
@@ -556,8 +555,8 @@ class productplanModel extends model
                 if($childPlan->begin < $minBegin) $minBegin = $childPlan->begin;
                 if($childPlan->end > $maxEnd) $maxEnd = $childPlan->end;
             }
-            if($minBegin < $plan->begin and $minBegin != $this->config->productplan->future) dao::$errors['begin'] = sprintf($this->lang->productplan->beginGreaterChildTip, $oldPlan->title, $plan->begin, $minBegin);
-            if($maxEnd > $plan->end and $maxEnd != $this->config->productplan->future) dao::$errors['end'] = sprintf($this->lang->productplan->endLetterChildTip, $oldPlan->title, $plan->end, $maxEnd);
+            if($minBegin < $plan->begin and $minBegin != $futureTime) dao::$errors['begin'] = sprintf($this->lang->productplan->beginGreaterChildTip, $oldPlan->title, $plan->begin, $minBegin);
+            if($maxEnd > $plan->end and $maxEnd != $futureTime) dao::$errors['end'] = sprintf($this->lang->productplan->endLetterChildTip, $oldPlan->title, $plan->end, $maxEnd);
         }
 
         if(dao::isError()) return false;
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 1e045bdebd..2deed208bc 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -41,10 +41,14 @@
             <th><?php echo $lang->productplan->title;?></th>
             <td><?php echo html::input('title', $plan->title, "class='form-control' required");?></td><td></td><td></td>
           </tr>
-          <tr <?php echo $plan->parent == '-1' ? "class='hidden'": '';?>>
+          <?php if($plan->parent == '-1'):?>
+              <?php echo html::hidden('parent', $plan->parent);?>
+          <?php else:?>
+          <tr>
             <th><?php echo $lang->productplan->parent;?></th>
             <td><?php echo html::select('parent', array('0' => '') + $parentPlanPairs, $plan->parent, "class='form-control chosen'");?>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->productplan->status;?></th>
             <?php $disabled = $plan->parent == -1 ? "disabled='disabled'" : '' ;?>

From 97073567df09ee79b7377ba9ed9bb744bd38c4c0 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Thu, 17 Nov 2022 08:42:31 +0000
Subject: [PATCH 063/129] =?UTF-8?q?*=20Finish=20task=20#76435=E3=80=817643?=
 =?UTF-8?q?6=E3=80=8176437.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/build/control.php        | 28 ++++++++++------------------
 module/build/model.php          | 30 ++++++++++++++----------------
 module/build/view/view.html.php |  4 ++--
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 0abe7eb54e..45fae6f3d5 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -255,7 +255,7 @@ class build extends control
 
         $bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
         $bugs = $this->dao->select('*')->from(TABLE_BUG)
-            ->where('id')->in($build->bugs)
+            ->where('id')->in($build->allBugs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'bug')->orderBy($sort)->fi()
             ->page($bugPager)
@@ -264,7 +264,7 @@ class build extends control
         /* Get stories and stages. */
         $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
         $stories    = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY)
-            ->where('id')->in($build->stories)
+            ->where('id')->in($build->allStories)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'story')->orderBy($sort)->fi()
             ->page($storyPager)
@@ -277,10 +277,14 @@ class build extends control
         if($this->app->tab == 'project')
         {
             $this->loadModel('project')->setMenu($build->project);
+            $objectType = 'project';
+            $objectID   = $build->project;
         }
         elseif($this->app->tab == 'execution')
         {
             $this->loadModel('execution')->setMenu($build->execution);
+            $objectType = 'execution';
+            $objectID   = $build->execution;
         }
 
         $executions = $this->loadModel('execution')->getPairs($this->session->project, 'all', 'empty');
@@ -297,18 +301,6 @@ class build extends control
 
         $this->executeHooks($buildID);
 
-        if($this->app->tab == 'execution')
-        {
-            $objectType = 'execution';
-            $objectID   = $build->execution;
-        }
-        else
-        {
-            $objectType = 'project';
-            $objectID   = $build->project;
-        }
-
-
         /* Assign. */
         $this->view->canBeChanged = common::canBeChanged('build', $build); // Determines whether an object is editable.
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
@@ -611,11 +603,11 @@ class build extends control
         $executionID = $build->execution ? $build->execution : $build->project;
         if($browseType == 'bySearch')
         {
-            $allStories = $this->story->getBySearch($build->product, $build->branch, $queryID, 'id', $executionID, 'story', $build->stories, $pager);
+            $allStories = $this->story->getBySearch($build->product, $build->branch, $queryID, 'id', $executionID, 'story', $build->allStories, $pager);
         }
         else
         {
-            $allStories = $this->story->getExecutionStories($executionID, $build->product, 0, 't1.`order`_desc', 'byBranch', $build->branch, 'story', $build->stories, $pager);
+            $allStories = $this->story->getExecutionStories($executionID, $build->product, 0, 't1.`order`_desc', 'byBranch', $build->branch, 'story', $build->allStories, $pager);
         }
 
         $this->view->allStories   = $allStories;
@@ -735,11 +727,11 @@ class build extends control
         $executionID = $build->execution ? $build->execution : $build->project;
         if($browseType == 'bySearch')
         {
-            $allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->bugs, $pager, $build->project);
+            $allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->allBugs, $pager, $build->project);
         }
         else
         {
-            $allBugs = $this->bug->getExecutionBugs($executionID, 0, 'all', $buildID, 'noclosed', 0, 'status_desc,id_desc', $build->bugs, $pager);
+            $allBugs = $this->bug->getExecutionBugs($executionID, 0, 'all', $buildID, 'noclosed', 0, 'status_desc,id_desc', $build->allBugs, $pager);
         }
 
         $this->view->allBugs    = $allBugs;
diff --git a/module/build/model.php b/module/build/model.php
index 695656a2f1..02698c30e5 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -31,6 +31,7 @@ class buildModel extends model
             ->fetch();
         if(!$build) return false;
 
+        $build = $this->linkChildBuilds($build);
         $build = $this->loadModel('file')->replaceImgURL($build, 'desc');
         $build->files = $this->file->getByObject('build', $buildID);
         if($setImgSize) $build->desc = $this->file->setImgSize($build->desc);
@@ -349,7 +350,6 @@ class buildModel extends model
         if(!dao::isError())
         {
             $buildID = $this->dao->lastInsertID();
-            $this->linkChildBuilds($buildID, $build->builds);
             $this->file->updateObjectID($this->post->uid, $buildID, 'build');
             $this->file->saveUpload('build', $buildID);
             $this->loadModel('score')->create('build', 'create', $buildID);
@@ -389,8 +389,6 @@ class buildModel extends model
         if(isset($build->branch) and $oldBuild->branch != $build->branch) $this->dao->update(TABLE_RELEASE)->set('branch')->eq($build->branch)->where('build')->eq($buildID)->exec();
         if(!dao::isError())
         {
-            $addBuilds = array_diff(explode(',', $build->builds), explode(',', $oldBuild->builds));
-            if($addBuilds) $this->linkChildBuilds($buildID, $addBuilds);
             $this->file->updateObjectID($this->post->uid, $buildID, 'build');
             return common::createChanges($oldBuild, $build);
         }
@@ -569,28 +567,28 @@ class buildModel extends model
     /**
      * Bugs and stories associated with child builds.
      *
-     * @param  int    $buildID
-     * @param  string $childBuildIDList
+     * @param  object  $build
      * @access public
-     * @return void
+     * @return object
      */
-    public function linkChildBuilds($buildID, $childBuildIDList)
+    public function linkChildBuilds($build)
     {
-        $build       = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
-        $childBuilds = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuildIDList)->fetchAll();
+        $build->allBugs    = $build->bugs;
+        $build->allStories = $build->stories;
+        $childBuilds = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($build->builds)->fetchAll();
 
         foreach($childBuilds as $childBuild)
         {
-            if($childBuild->bugs)    $build->bugs    .= ",{$childBuild->bugs}";
-            if($childBuild->stories) $build->stories .= ",{$childBuild->stories}";
+            if($childBuild->bugs)    $build->allBugs    .= ",{$childBuild->bugs}";
+            if($childBuild->stories) $build->allStories .= ",{$childBuild->stories}";
         }
 
-        $build->bugs    = explode(',', $build->bugs);
-        $build->bugs    = join(',', array_unique(array_filter($build->bugs)));
-        $build->stories = explode(',', $build->stories);
-        $build->stories = join(',', array_unique(array_filter($build->stories)));
+        $build->allBugs    = explode(',', $build->allBugs);
+        $build->allBugs    = join(',', array_unique(array_filter($build->allBugs)));
+        $build->allStories = explode(',', $build->allStories);
+        $build->allStories = join(',', array_unique(array_filter($build->allStories)));
 
-        $this->dao->update(TABLE_BUILD)->data($build)->where('id')->eq($buildID)->exec();
+        return $build;
     }
 
     /**
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 9ca7217e2d..048b6082b1 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -98,7 +98,7 @@ tbody tr td:first-child input {display: none;}
               <tr>
                 <td class='c-id text-left'>
                   <?php if($canBatchUnlink):?>
-                  <?php echo html::checkbox('unlinkStories', array($story->id => sprintf('%03d', $story->id)));?>
+                  <?php echo html::checkbox('unlinkStories', array($story->id => sprintf('%03d', $story->id)), '', strpos(",$build->stories,", ",$story->id,") !== false ? '' : "disabled");?>
                   <?php else:?>
                   <?php printf('%03d', $story->id);?>
                   <?php endif;?>
@@ -198,7 +198,7 @@ tbody tr td:first-child input {display: none;}
               <tr>
                 <td class='c-id text-left'>
                   <?php if($canBatchUnlink):?>
-                  <?php echo html::checkbox('unlinkBugs', array($bug->id => sprintf('%03d', $bug->id)));?>
+                  <?php echo html::checkbox('unlinkBugs', array($bug->id => sprintf('%03d', $bug->id)), '', strpos(",$build->bugs,", ",$bug->id,") !== false ? '' : "disabled");?>
                   <?php else:?>
                   <?php printf('%03d', $bug->id);?>
                   <?php endif;?>

From 05d9cef073f03287fccaf8c7fa5fae8a8ef1a7bf Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 17 Nov 2022 16:52:31 +0800
Subject: [PATCH 064/129] * Fix bug #29957.

---
 module/repo/js/edit.js         | 3 ++-
 module/repo/model.php          | 1 +
 module/repo/view/edit.html.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/repo/js/edit.js b/module/repo/js/edit.js
index 85c1b2f921..19ff865cfb 100644
--- a/module/repo/js/edit.js
+++ b/module/repo/js/edit.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    scmChanged(scm, true);
+    scmChanged(repoSCM, true);
     $('#submit').mousedown(function()
     {
         $form = $(this).closest('form');
@@ -86,6 +86,7 @@ function scmChanged(scm, isFirstRequest = false)
     if(scm == 'Git' || scm == 'Gitea' || scm == 'Gogs')
     {
         $('.account-fields').addClass('hidden');
+        if(['Git', 'Gitea', 'Gogs'].indexOf(repoSCM) === -1) $('#client').val('');
 
         $('.tips-git').removeClass('hidden');
         $('.tips-svn').addClass('hidden');
diff --git a/module/repo/model.php b/module/repo/model.php
index 817dd0abe3..a4b49e5fba 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -253,6 +253,7 @@ class repoModel extends model
     public function update($id)
     {
         $repo = $this->getRepoByID($id);
+        if(!$this->checkConnection()) return false;
 
         $isPipelineServer = in_array(strtolower($this->post->SCM), $this->config->repo->gitServiceList) ? true : false;
 
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index 2f35e7b3b3..15cfacde7f 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -18,7 +18,7 @@
 .user-addon{padding-right: 16px; padding-left: 16px;}
 </style>
 <?php endif;?>
-<?php js::set('scm', $repo->SCM);?>
+<?php js::set('repoSCM', $repo->SCM);?>
 <?php js::set('objectID', $objectID);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>

From 4fe09fb5077c9eaf7e78a6ffa584669f91e1ed13 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Fri, 18 Nov 2022 08:49:38 +0800
Subject: [PATCH 065/129] * Fix GH-104, Get extension removePath error.

---
 lib/zfile/zfile.class.php    |  2 +-
 module/extension/control.php |  7 +++----
 module/extension/model.php   | 10 ++++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/zfile/zfile.class.php b/lib/zfile/zfile.class.php
index 8e24357a7a..4903d50df4 100644
--- a/lib/zfile/zfile.class.php
+++ b/lib/zfile/zfile.class.php
@@ -223,7 +223,7 @@ class zfile
     * 
     * @param  string    $patern
     * @access public
-    * @return avoid
+    * @return void
     */
     public function batchRemoveFile($patern)
     {
diff --git a/module/extension/control.php b/module/extension/control.php
index 1ff63ffd9e..fb760bed0e 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -145,7 +145,6 @@ class extension extends control
         $this->view->upgrade     = $upgrade;
         $this->view->title       = $installTitle . $extension;
 
-
         $statusFile = $this->loadModel('common')->checkSafeFile();
         if($statusFile)
         {
@@ -186,7 +185,7 @@ class extension extends control
         $incompatible = $condition->zentao['incompatible'];
         if($this->extension->checkVersion($incompatible))
         {
-            $this->view->error = sprintf($this->lang->extension->errorIncompatible);
+            $this->view->error = $this->lang->extension->errorIncompatible;
             return $this->display();
         }
 
@@ -220,7 +219,7 @@ class extension extends control
                 $noDepends = false;
                 if(isset($installedExts[$code]))
                 {
-                    if($this->extension->compare4Limit($installedExts[$code]->version, $limit, 'noBetween'))$noDepends = true;
+                    if($this->extension->compare4Limit($installedExts[$code]->version, $limit, 'noBetween')) $noDepends = true;
                 }
                 else
                 {
@@ -235,7 +234,7 @@ class extension extends control
                     if(!empty($limit['max'])) $extVersion .= ' <=v' . $limit['max'];
                     $extVersion .=')';
                 }
-                if($noDepends)$dependsExt .= $code . $extVersion . ' ' . html::a(inlink('obtain', 'type=bycode&param=' . helper::safe64Encode($code)), $this->lang->extension->installExt, '_blank') . '<br />';
+                if($noDepends) $dependsExt .= $code . $extVersion . ' ' . html::a(inlink('obtain', 'type=bycode&param=' . helper::safe64Encode($code)), $this->lang->extension->installExt, '_blank') . '<br />';
             }
 
             if($noDepends)
diff --git a/module/extension/model.php b/module/extension/model.php
index e1d16fd42d..9094b74003 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -525,9 +525,11 @@ class extensionModel extends model
         /* Extract files. */
         $packageFile = $this->getPackageFile($extension);
         $this->app->loadClass('pclzip', true);
-        $zip = new pclzip($packageFile);
-        $files = $zip->listContent();
-        $removePath = $files[0]['filename'];
+        $zip        = new pclzip($packageFile);
+        $files      = $zip->listContent();
+        $pathinfo   = pathinfo($files[0]['filename']);
+        $removePath = isset($pathinfo['dirname']) && $pathinfo['dirname'] != '.' ? $pathinfo['dirname'] : $pathinfo['basename'];
+
         if($zip->extract(PCLZIP_OPT_PATH, $extensionPath, PCLZIP_OPT_REMOVE_PATH, $removePath) == 0)
         {
             $return->result = 'fail';
@@ -548,7 +550,7 @@ class extensionModel extends model
     {
         $appRoot      = $this->app->getAppRoot();
         $extensionDir = "ext/$extension/";
-        $paths       = scandir($extensionDir);
+        $paths        = scandir($extensionDir);
         $copiedFiles  = array();
 
         foreach($paths as $path)

From 86812c33bf3709bce3d35ed61233f6bfcef8c8f1 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 09:17:39 +0800
Subject: [PATCH 066/129] * Fix bug#29742.

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

diff --git a/module/product/model.php b/module/product/model.php
index 3bb5714f04..896dfb8304 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -124,7 +124,7 @@ class productModel extends model
             if($isQaModule) $moduleName = 'bug';
             if($isFeedbackModel) $moduleName = 'feedback';
             $dropMenuLink = helper::createLink($moduleName, 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
-            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProduct->name}'><span class='text'>{$currentProduct->name}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProduct->name}' style='width: 90%'><span class='text'>{$currentProduct->name}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
             $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
             $output .= "</div></div>";
             if($isMobile) $output = "<a id='currentItem' href=\"javascript:showSearchMenu('product', '$productID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentProduct->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
@@ -140,7 +140,7 @@ class productModel extends model
                 if(!$isMobile)
                 {
                     $dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&branch=$branch&module=$currentModule&method=$currentMethod&extra=$extra");
-                    $output .= "<div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$branchName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+                    $output .= "<div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit' title='{$branchName}' style='width: 90%'>{$branchName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
                     $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
                     $output .= "</div></div>";
                 }

From ccbf2ee9eb0e739e82e679870e628e4733bbe5d9 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 18 Nov 2022 09:59:39 +0800
Subject: [PATCH 067/129] * Fix task #76414

---
 module/execution/view/story.html.php | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index e6883a207a..cc9427c527 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -243,7 +243,9 @@
       $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
       $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
       $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
-      $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+      $canBatchAssignTo    = common::hasPriv($storyType, 'batchAssignTo');
+
+      $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask or $canBatchAssignTo));
       ?>
       <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
       <table class='table tablesorter has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='storyList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
@@ -321,6 +323,37 @@
             </ul>
             <?php endif;?>
           </div>
+
+          <?php if($canBatchAssignTo):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn assignedTo"><?php echo $lang->story->assignedTo;?> <span class="caret"></span></button>
+            <?php
+            $withSearch = count($users) > 10;
+            $actionLink = $this->createLink('story', 'batchAssignTo', "storyType=$storyType");
+            echo html::select('assignedTo', $users, '', 'class="hidden"');
+            ?>
+            <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
+              <?php if($withSearch):?>
+              <?php $usersPinYin = common::convert2Pinyin($users);?>
+              <div class="input-control search-box has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+              <?php endif;?>
+              <div class="list-group">
+              <?php foreach ($users as $key => $value):?>
+              <?php
+              if(empty($key) or $key == 'closed') continue;
+              $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
+              echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\", \"#storyList\")", $value, '', $searchKey);
+              ?>
+              <?php endforeach;?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
+
           <?php
           if($canBatchClose)
           {

From 51f8bf37d697db2c866fa0d200520f9baa843e33 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 18 Nov 2022 02:06:16 +0000
Subject: [PATCH 068/129] * Resolved feedback #1468.

---
 module/bug/control.php             |  8 ++++++--
 module/bug/js/common.js            |  8 ++++++++
 module/bug/view/batchedit.html.php |  2 +-
 module/productplan/model.php       | 11 +++++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7c12932430..f5da31c669 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1243,8 +1243,12 @@ class bug extends control
             $branchProduct = $product->type == 'normal' ? false : true;
 
             /* Set plans. */
-            $plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
-            $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
+            foreach($bugs as $bug)
+            {
+                $plans      = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
+                $plans      = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
+                $bug->plans = $plans;
+            }
 
             /* Set branches and modules. */
             $branches        = 0;
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index a5832ffbb7..4df2463255 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -885,6 +885,14 @@ function setBranchRelated(branchID, productID, num)
         $('#plans' + num).parent('td').load(planLink, function()
         {
             $('#plans' + num).chosen();
+            if(planID == 1)
+            {
+                $(this).find('option').each(function()
+                {
+                    if($(this).val() == 'ditto') $(this).remove();
+                });
+                $('#plans' + num).chosen().trigger('chosen:updated');
+            }
         });
     }
 }
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 89d343479d..54b6a5a704 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -103,7 +103,7 @@
             </td>
             <?php endif;?>
             <td><?php echo html::select("modules[$bugID]", isset($modules[$bug->product][$bug->branch]) ? $modules[$bug->product][$bug->branch] : array(0 => '/'), $bug->module, "class='form-control picker-select' data-drop-width='auto'");?></td>
-            <td class='<?php echo zget($visibleFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $plans, $bug->plan, "class='form-control picker-select' data-drop-width='auto'");?></td>
+            <td class='<?php echo zget($visibleFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $bug->plans, $bug->plan, "class='form-control picker-select' data-drop-width='auto'");?></td>
             <?php
             $assignedToList = array();
             if($app->tab == 'project' or $app->tab == 'execution')
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 1f05807b2d..e00c1a59b3 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -247,7 +247,7 @@ class productplanModel extends model
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t3.id=t1.product')
             ->where('t1.product')->in($product)
             ->andWhere('t1.deleted')->eq(0)
-            ->beginIF($branch !== '')->andWhere('t1.branch')->in($branch)->fi()
+            ->beginIF($branch !== '' and $branch != 'all')->andWhere('t1.branch')->in("0,$branch")->fi()
             ->beginIF(strpos($param, 'unexpired') !== false)->andWhere('t1.end')->ge($date)->fi()
             ->beginIF(strpos($param, 'noclosed')  !== false)->andWhere('t1.status')->ne('closed')->fi()
             ->orderBy('t1.begin desc')
@@ -255,6 +255,7 @@ class productplanModel extends model
 
         $plans     = $this->reorder4Children($plans);
         $planPairs = array();
+        $this->app->loadLang('bug');
         $this->app->loadLang('branch');
         foreach($plans as $plan)
         {
@@ -263,8 +264,14 @@ class productplanModel extends model
             $planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
             if($plan->begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
             if($plan->productType != 'normal') $planPairs[$plan->id] = ($plan->branchName ? $plan->branchName : $this->lang->branch->main) . ' / ' . $planPairs[$plan->id];
+            if(empty($plan->branchName))
+            {
+                $mainplan = $planPairs[$plan->id];
+                unset($planPairs[$plan->id]);
+            }
         }
-        return array('' => '') + $planPairs;
+        array_splice($planPairs, 0, 0, $mainplan);
+        return array('' => '', 'ditto' => $this->lang->bug->ditto) + $planPairs;
     }
 
     /**

From 1757b9ab9da0f226ddaae7ebe44710fa00af83de Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 10:16:31 +0800
Subject: [PATCH 069/129] * Fix bug#29969.

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

diff --git a/module/report/model.php b/module/report/model.php
index 4e2f16bb0f..b6ff30b900 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -726,6 +726,7 @@ class reportModel extends model
             ->orWhere('RD')->in($accounts)
             ->markRight(1)
             ->fi()
+            ->andWhere('shadow')->eq(0)
             ->fetchAll('id');
 
         /* Get created plans in this year. */
@@ -733,6 +734,7 @@ class reportModel extends model
             ->leftJoin(TABLE_ACTION)->alias('t2')->on("t1.id=t2.objectID and t2.objectType='productplan'")
             ->where('LEFT(t2.date, 4)')->eq($year)
             ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t1.product')->in(array_keys($products))
             ->beginIF($accounts)
             ->andWhere('t2.actor')->in($accounts)
             ->fi()
@@ -750,11 +752,13 @@ class reportModel extends model
         $createStoryProducts = $this->dao->select('DISTINCT product')->from(TABLE_STORY)
             ->where('LEFT(openedDate, 4)')->eq($year)
             ->andWhere('deleted')->eq(0)
+            ->andWhere('product')->in(array_keys($products))
             ->beginIF($accounts)->andWhere('openedBy')->in($accounts)->fi()
             ->fetchPairs('product', 'product');
         $closeStoryProducts  = $this->dao->select('DISTINCT product')->from(TABLE_STORY)
             ->where('LEFT(closedDate, 4)')->eq($year)
             ->andWhere('deleted')->eq(0)
+            ->andWhere('product')->in(array_keys($products))
             ->beginIF($accounts)->andWhere('closedBy')->in($accounts)->fi()
             ->fetchPairs('product', 'product');
         if($createStoryProducts or $closeStoryProducts)

From a35818ef8cd992460a283b5759d397a1dfa11659 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Fri, 18 Nov 2022 02:27:28 +0000
Subject: [PATCH 070/129] * Fix unlink btn class bug.

---
 module/build/view/view.html.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 048b6082b1..ed682f0ede 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -95,10 +95,11 @@ tbody tr td:first-child input {display: none;}
             </thead>
             <tbody class='text-center'>
               <?php foreach($stories as $storyID => $story):?>
+              <?php $unlinkClass = strpos(",$build->stories,", ",$story->id,") !== false ? '' : "disabled";?>
               <tr>
                 <td class='c-id text-left'>
                   <?php if($canBatchUnlink):?>
-                  <?php echo html::checkbox('unlinkStories', array($story->id => sprintf('%03d', $story->id)), '', strpos(",$build->stories,", ",$story->id,") !== false ? '' : "disabled");?>
+                  <?php echo html::checkbox('unlinkStories', array($story->id => sprintf('%03d', $story->id)), '', $unlinkClass);?>
                   <?php else:?>
                   <?php printf('%03d', $story->id);?>
                   <?php endif;?>
@@ -138,7 +139,7 @@ tbody tr td:first-child input {display: none;}
                   if($canBeChanged and common::hasPriv($module, 'unlinkStory'))
                   {
                       $unlinkURL = $this->createLink($module, 'unlinkStory', "buildID=$build->id&story=$story->id");
-                      echo html::a($unlinkURL, '<i class="icon-unlink"></i>', 'hiddenwin', "class='btn' title='{$lang->build->unlinkStory}'");
+                      echo html::a($unlinkURL, '<i class="icon-unlink"></i>', 'hiddenwin', "class='btn' title='{$lang->build->unlinkStory}' $unlinkClass");
                   }
                   ?>
                 </td>
@@ -194,11 +195,12 @@ tbody tr td:first-child input {display: none;}
             </thead>
             <tbody class='text-center'>
               <?php foreach($bugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
+              <?php $bugLink     = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
+              <?php $unlinkClass = strpos(",$build->bugs,", ",$bug->id,") !== false ? '' : "disabled";?>
               <tr>
                 <td class='c-id text-left'>
                   <?php if($canBatchUnlink):?>
-                  <?php echo html::checkbox('unlinkBugs', array($bug->id => sprintf('%03d', $bug->id)), '', strpos(",$build->bugs,", ",$bug->id,") !== false ? '' : "disabled");?>
+                  <?php echo html::checkbox('unlinkBugs', array($bug->id => sprintf('%03d', $bug->id)), '', $unlinkClass);?>
                   <?php else:?>
                   <?php printf('%03d', $bug->id);?>
                   <?php endif;?>
@@ -219,7 +221,7 @@ tbody tr td:first-child input {display: none;}
                   if($canBeChanged and common::hasPriv($module, 'unlinkBug'))
                   {
                       $unlinkURL = $this->createLink($module, 'unlinkBug', "buildID=$build->id&bug=$bug->id");
-                      echo html::a("###", '<i class="icon-unlink"></i>', '', "onclick='ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)' class='btn' title='{$lang->build->unlinkBug}'");
+                      echo html::a("###", '<i class="icon-unlink"></i>', '', (!$unlinkClass ? "onclick='ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)'" : '') . "class='btn' title='{$lang->build->unlinkBug}' $unlinkClass");
                   }
                   ?>
                 </td>

From 8d97e96399068d58f1e93f27a260079ac265b446 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Fri, 18 Nov 2022 10:31:15 +0800
Subject: [PATCH 071/129] * Fix bug #29944.

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

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 1f05807b2d..47c8f6b96d 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -646,7 +646,11 @@ class productplanModel extends model
         $childStatus = $this->dao->select('status')->from(TABLE_PRODUCTPLAN)->where('parent')->eq($parentID)->andWhere('deleted')->eq(0)->fetchPairs();
 
         /* If the subplan is empty, update the plan. */
-        if(empty($childStatus)) $this->dao->update(TABLE_PRODUCTPLAN)->set('parent')->eq(0)->where('id')->eq($parentID)->exec();
+        if(empty($childStatus))
+        {
+            $this->dao->update(TABLE_PRODUCTPLAN)->set('parent')->eq(0)->set('status')->eq('wait')->where('id')->eq($parentID)->exec();
+            return;
+        }
 
         if(count($childStatus) == 1 and isset($childStatus['wait']))
         {

From 6743a6e779c208528645af10a315ba73233e464d Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 18 Nov 2022 02:40:02 +0000
Subject: [PATCH 072/129]  * Fix bug #29931.

---
 module/project/control.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index ca5bebc660..8d9b76fa72 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2173,15 +2173,15 @@ class project extends control
                 if($executionID) $this->execution->updateProducts($executionID);
             }
 
-            $oldProducts  = array_keys($oldProducts);
-            $newProducts  = $this->product->getProducts($projectID);
-            $newProducts  = array_keys($newProducts);
-            $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
+            $newProducts   = $this->product->getProducts($projectID);
+            $oldProductIDs = array_keys($oldProducts);
+            $newProductIDs = array_keys($newProducts);
+            $diffProducts  = array_merge(array_diff($oldProductIDs, $newProductIDs), array_diff($newProductIDs, $oldProductIDs));
             if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
 
             if($project->multiple)
             {
-                $unlinkedProducts = array_diff($oldProducts, $newProducts);
+                $unlinkedProducts = array_diff($oldProductIDs, $newProductIDs);
                 if(!empty($unlinkedProducts))
                 {
                     $unlinkedProductPairs = array();

From fa166ed6e1829926a0ac1c7a13e86c2ca25f4e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E9=A3=9E?= <lufei@easycorp.ltd>
Date: Fri, 18 Nov 2022 02:43:51 +0000
Subject: [PATCH 073/129] * Hide logout and user-deny page's footer in xuanxuan
 client mode.

---
 .../common/ext/view/header.xuanxuan.html.hook.php    | 12 ++++++++++++
 .../extension/xuan/user/ext/lang/de/xuanxuan.php     |  5 +++++
 .../extension/xuan/user/ext/lang/en/xuanxuan.php     |  5 +++++
 .../extension/xuan/user/ext/lang/fr/xuanxuan.php     |  5 +++++
 .../extension/xuan/user/ext/lang/zh-cn/xuanxuan.php  |  5 +++++
 5 files changed, 32 insertions(+)

diff --git a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
index aa222bcd5e..4412780e6f 100644
--- a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
+++ b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
@@ -22,6 +22,10 @@ body {scrollbar-gutter: stable both-edges;}
 <script>
 $(function()
 {
+    const logoutElement = $('#userNav .has-avatar .pull-right li > a[href*="logout"]');
+    logoutElement.parent().addClass('hide');
+    if(logoutElement.parent().prev().hasClass('divider')) logoutElement.parent().prev().addClass('hide');
+
     if(window.parent === window || window.parent.appHeaderStyleUpdated) return;
     const mainHeader = document.getElementById('mainHeader');
     if(!mainHeader) return;
@@ -32,4 +36,12 @@ $(function()
     window.open('xxc://setAppHeaderStyle/zentao-integrated/' + encodeURIComponent(JSON.stringify(clientHeaderStyle)), '_blank');
 });
 </script>
+<?php if($this->app->moduleName =='user' && $this->app->methodName == 'deny'): ?>
+<script>
+$(function()
+{
+    $('.m-user-deny .modal-footer').addClass('hide');
+});
+</script>
+<?php endif; ?>
 <?php endif; ?>
diff --git a/xuanxuan/extension/xuan/user/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/user/ext/lang/de/xuanxuan.php
index fe03c8f2f7..d2a3bc7ac6 100644
--- a/xuanxuan/extension/xuan/user/ext/lang/de/xuanxuan.php
+++ b/xuanxuan/extension/xuan/user/ext/lang/de/xuanxuan.php
@@ -1,2 +1,7 @@
 <?php
 $lang->user->tokenInvalid  = "Token denied, please login with password.";
+
+if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
+{
+    $lang->user->errorDeny = "Sorry, your access to <b>%2\$s</b> of <b>%1\$s</b> is denied. Please contact your Admin to get privileges.";
+}
diff --git a/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
index fe03c8f2f7..d2a3bc7ac6 100644
--- a/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/user/ext/lang/en/xuanxuan.php
@@ -1,2 +1,7 @@
 <?php
 $lang->user->tokenInvalid  = "Token denied, please login with password.";
+
+if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
+{
+    $lang->user->errorDeny = "Sorry, your access to <b>%2\$s</b> of <b>%1\$s</b> is denied. Please contact your Admin to get privileges.";
+}
diff --git a/xuanxuan/extension/xuan/user/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/user/ext/lang/fr/xuanxuan.php
index fe03c8f2f7..d2a3bc7ac6 100644
--- a/xuanxuan/extension/xuan/user/ext/lang/fr/xuanxuan.php
+++ b/xuanxuan/extension/xuan/user/ext/lang/fr/xuanxuan.php
@@ -1,2 +1,7 @@
 <?php
 $lang->user->tokenInvalid  = "Token denied, please login with password.";
+
+if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
+{
+    $lang->user->errorDeny = "Sorry, your access to <b>%2\$s</b> of <b>%1\$s</b> is denied. Please contact your Admin to get privileges.";
+}
diff --git a/xuanxuan/extension/xuan/user/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/user/ext/lang/zh-cn/xuanxuan.php
index c4e2aa9b49..caa8438ff6 100644
--- a/xuanxuan/extension/xuan/user/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/user/ext/lang/zh-cn/xuanxuan.php
@@ -1,2 +1,7 @@
 <?php
 $lang->user->tokenInvalid  = "Token 认证失败，请尝试使用密码登录。";
+
+if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') != false)
+{
+    $lang->user->errorDeny = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。";
+}

From 5df0b941b1646da906278a1e5ddc916276ca0766 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Fri, 18 Nov 2022 02:51:50 +0000
Subject: [PATCH 074/129] * Fix bug #29959.

---
 module/product/control.php | 5 +++--
 module/project/control.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 0a93b24502..f20461fef2 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -945,10 +945,11 @@ class product extends control
      * @param  string $number
      * @param  int    $executionID
      * @param  string $from showImport
+     * @param  string mode
      * @access public
      * @return void
      */
-    public function ajaxGetExecutions($productID, $projectID = 0, $branch = 0, $number = '', $executionID = 0, $from = '')
+    public function ajaxGetExecutions($productID, $projectID = 0, $branch = 0, $number = '', $executionID = 0, $from = '', $mode = '')
     {
         if($this->app->tab == 'execution' and $this->session->execution)
         {
@@ -956,7 +957,7 @@ class product extends control
             if($execution->type == 'kanban') $projectID = $execution->project;
         }
 
-        $mode  = ($from == 'bugToTask' or empty($this->config->CRExecution)) ? 'noclosed' : '';
+        $mode .= ($from == 'bugToTask' or empty($this->config->CRExecution)) ? 'noclosed' : '';
         $mode .= !$projectID ? ',multiple' : '';
         $executions = $from == 'showImport' ? $this->product->getAllExecutionPairsByProduct($productID, $branch, $projectID) : $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, $mode);
         if($this->app->getViewType() == 'json') return print(json_encode($executions));
diff --git a/module/project/control.php b/module/project/control.php
index ca5bebc660..cd153dbc41 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2295,12 +2295,13 @@ class project extends control
      *
      * @param  int    $projectID
      * @param  int    $executionID
+     * @param  string $mode
      * @access public
      * @return void
      */
-    public function ajaxGetExecutions($projectID, $executionID = 0)
+    public function ajaxGetExecutions($projectID, $executionID = 0, $mode = '')
     {
-        $executions = array('' => '') + $this->loadModel('execution')->getPairs($projectID, 'all');
+        $executions = array('' => '') + $this->loadModel('execution')->getPairs($projectID, 'all', $mode);
 
         if($this->app->getViewType() == 'json') return print(json_encode($executionList));
         return print(html::select('execution', $executions, $executionID, "class='form-control'"));

From db540eb67ab2c6174abf8dd2799641a01fd58476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Fri, 18 Nov 2022 10:53:30 +0800
Subject: [PATCH 075/129]  * code for task #76438.

---
 db/update17.8.sql                          |  1 +
 db/zentao.sql                              |  1 +
 module/build/model.php                     | 26 ++++++----
 module/projectrelease/control.php          |  4 +-
 module/projectrelease/model.php            | 40 +---------------
 module/projectrelease/view/browse.html.php | 15 +++---
 module/projectrelease/view/create.html.php |  4 +-
 module/projectrelease/view/edit.html.php   |  2 +-
 module/release/config.php                  |  2 +-
 module/release/lang/de.php                 |  1 -
 module/release/lang/en.php                 |  1 -
 module/release/lang/fr.php                 |  1 -
 module/release/lang/zh-cn.php              |  1 -
 module/release/model.php                   | 55 ++++++----------------
 module/release/view/browse.html.php        | 20 ++++----
 module/release/view/create.html.php        |  4 +-
 module/release/view/edit.html.php          |  2 +-
 17 files changed, 60 insertions(+), 120 deletions(-)

diff --git a/db/update17.8.sql b/db/update17.8.sql
index 2a034e97e3..e1887d15ce 100644
--- a/db/update17.8.sql
+++ b/db/update17.8.sql
@@ -5,6 +5,7 @@ ALTER TABLE `zt_repo` ADD `projects` varchar(255) NOT NULL AFTER `product`;
 ALTER TABLE `zt_release` CHANGE `project` `project` varchar(255) NOT NULL;
 ALTER TABLE `zt_release` CHANGE `branch` `branch` varchar(255) NOT NULL;
 ALTER TABLE `zt_release` CHANGE `build` `build` varchar(255) NOT NULL;
+ALTER TABLE `zt_release` ADD `shadow` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `branch`;
 
 CREATE OR REPLACE VIEW `ztv_normalproduct` AS SELECT * FROM `zt_product` WHERE `shadow` = 0;
 
diff --git a/db/zentao.sql b/db/zentao.sql
index 557a6663ad..5ff8e2ae96 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1285,6 +1285,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` (
   `project` varchar(255) NOT NULL,
   `product` mediumint(8) unsigned NOT NULL default '0',
   `branch` varchar(255) NOT NULL default '0',
+  `shadow` mediumint(8) unsigned NOT NULL default '0',
   `build` varchar(255) NOT NULL,
   `name` varchar(255) NOT NULL default '',
   `marker` enum('0','1') NOT NULL default '0',
diff --git a/module/build/model.php b/module/build/model.php
index 695656a2f1..2f4cb16f88 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -261,18 +261,24 @@ class buildModel extends model
         /* if the build has been released and replace is true, replace build name with release name. */
         if($replace)
         {
-            $releases = $this->dao->select('build, name')->from(TABLE_RELEASE)
-                ->where('build')->in(array_keys($builds))
-                ->andWhere('product')->in($products)
-                ->beginIF($branch !== 'all')->andWhere('branch')->in("$branchs")->fi()
-                ->andWhere('deleted')->eq(0)
-                ->fetchPairs();
-            foreach($releases as $buildID => $releaseName)
+            $releases = $this->dao->select('t1.id,t1.shadow,t1.build,t1.name')->from(TABLE_RELEASE)->alias('t1')
+                ->leftJoin(TABLE_BUILD)->alias('t2')->on('FIND_IN_SET(t2.id, t1.build)')
+                ->leftJoin(TABLE_BRANCH)->alias('t3')->on('FIND_IN_SET(t3.id, t1.branch)')
+                ->where('t2.id')->in(array_keys($builds))
+                ->andWhere('t1.product')->in($products)
+                ->beginIF($branch !== 'all')->andWhere('t3.id')->in($branchs)->fi()
+                ->andWhere('t1.deleted')->eq(0)
+                ->fetchAll('id');
+            foreach($releases as $release)
             {
-                $branchName = $allBuilds[$buildID]->branchName ? $allBuilds[$buildID]->branchName : $this->lang->branch->main;
-                if($allBuilds[$buildID]->productType != 'normal')
+                $releaseName = $release->name;
+                foreach(explode(',', trim($release->build, ',')) as $buildID)
                 {
-                    $builds[$buildID] = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
+                    $branchName = $allBuilds[$buildID]->branchName ? $allBuilds[$buildID]->branchName : $this->lang->branch->main;
+                    $buildName  = $releaseName;
+                    if($allBuilds[$buildID]->productType != 'normal') $buildName = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
+                    if($release->shadow and !isset($builds[$release->shadow])) $builds[$release->shadow] = $buildName;
+                    if(isset($builds[$buildID])) unset($builds[$buildID]);
                 }
             }
         }
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 6f9c856621..36992ea307 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -157,12 +157,12 @@ class projectrelease extends control
         $this->loadModel('story');
         $this->loadModel('bug');
         $this->loadModel('build');
-        $this->app->loadConfig('release');
+        $this->loadModel('release');
         $this->config->projectrelease->create = $this->config->release->create;
 
         if(!empty($_POST))
         {
-            $changes = $this->projectrelease->update($releaseID);
+            $changes = $this->release->update($releaseID);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $files = $this->loadModel('file')->saveUpload('release', $releaseID);
             if($changes or $files)
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 17bd84efef..476d3a353c 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -77,6 +77,7 @@ class projectreleaseModel extends model
         $builds = $this->dao->select("id,project,product,execution,name,scmPath,filePath")->from(TABLE_BUILD)->where('id')->in(array_unique($buildIdList))->fetchAll('id');
         foreach($releases as $release)
         {
+            $release->buildInfos = array();
             foreach(explode(',', $release->build) as $buildID)
             {
                 if(empty($buildID)) continue;
@@ -123,45 +124,6 @@ class projectreleaseModel extends model
         return $buildIdList;
     }
 
-    /**
-     * Update a release.
-     *
-     * @param  int    $releaseID
-     * @access public
-     * @return void
-     */
-    public function update($releaseID)
-    {
-        /* Init vars. */
-        $releaseID  = (int)$releaseID;
-        $oldRelease = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq($releaseID)->fetch();
-
-        /* Check build if build is required. */
-        if(strpos($this->config->release->edit->requiredFields, 'build') !== false and $this->post->build == false) return dao::$errors['build'] = sprintf($this->lang->error->notempty, $this->lang->release->build);
-
-        $release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
-            ->setDefault('mailto', '')
-            ->join('build', ',')
-            ->join('mailto', ',')
-            ->setIF(!$this->post->marker, 'marker', 0)
-            ->cleanInt('product')
-            ->remove('files,labels,allchecker,uid')
-            ->get();
-
-        $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->edit['id'], $this->post->uid);
-        $this->dao->update(TABLE_RELEASE)->data($release)
-            ->autoCheck()
-            ->batchCheck($this->config->release->edit->requiredFields, 'notempty')
-            ->check('name', 'unique', "id != '$releaseID' AND product = '{$oldRelease->product}' AND branch = '{$oldRelease->branch}' AND deleted = '0'")
-            ->where('id')->eq((int)$releaseID)
-            ->exec();
-        if(!dao::isError())
-        {
-            $this->file->updateObjectID($this->post->uid, $releaseID, 'release');
-            return common::createChanges($oldRelease, $release);
-        }
-    }
-
     /**
      * Link stories
      *
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 7686b8a08e..af383d90df 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -67,11 +67,12 @@
       <?php
       $i = 0;
       $buildCount = count($release->buildInfos);
+      $rowspan    = $buildCount > 1 ? "rowspan='$buildCount'" : '';
+      if($buildCount == 0) $release->buildInfos = array('');
       foreach($release->buildInfos as $buildID => $build):
       ?>
-      <?php if($i == 0):?>
-      <?php $rowspan = $buildCount > 1 ? "rowspan='$buildCount'" : '';?>
       <tr data-type='<?php echo $release->status;?>'>
+        <?php if($i == 0):?>
         <td <?php echo $rowspan?>><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td <?php echo $rowspan?>>
           <?php
@@ -82,7 +83,9 @@
         <?php if($project->hasProduct):?>
         <td <?php echo $rowspan?> title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
         <?php endif;?>
-        <td class='c-build' title='<?php echo $build->name;?>'><?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project'");?></td>
+        <?php endif;?>
+        <td class='c-build'><?php if($buildCount) echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project' title='<?php echo $build->name;?>'");?></td>
+        <?php if($i == 0):?>
         <?php $status = $this->processStatus('release', $release);?>
         <td <?php echo $rowspan?> class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
@@ -90,12 +93,8 @@
         <td <?php echo $rowspan?> class='text-center'><?php echo $release->date;?></td>
         <?php foreach($extendFields as $extendField) echo "<td $rowspan>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
         <td <?php echo $rowspan?> class='c-actions'><?php echo $this->projectrelease->buildOperateMenu($release, 'browse');?></td>
+        <?php endif;?>
       </tr>
-      <?php else:?>
-      <tr>
-        <td class='c-build' title='<?php echo $build->name;?>'><?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project'");?></td>
-      </tr>
-      <?php endif;?>
       <?php $i++; ?>
       <?php endforeach;?>
       <?php endforeach;?>
diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php
index d3c905fec9..d9fdff98dd 100644
--- a/module/projectrelease/view/create.html.php
+++ b/module/projectrelease/view/create.html.php
@@ -52,9 +52,7 @@
           <tr>
             <th><?php echo $lang->release->build;?></th>
             <td id='buildBox'><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple");?></td>
-            <td>
-              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->release->tips;?>"></icon>
-            </td>
+            <td></td>
           </tr>
           <tr>
             <th><?php echo $lang->release->date;?></th>
diff --git a/module/projectrelease/view/edit.html.php b/module/projectrelease/view/edit.html.php
index 2d287d373a..2164c01dfb 100644
--- a/module/projectrelease/view/edit.html.php
+++ b/module/projectrelease/view/edit.html.php
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->release->build;?></th>
-            <td><?php echo html::select('build[]', $builds, $release->build, "class='form-control chosen' multiple required"); ?></td><td></td>
+            <td><?php echo html::select('build[]', $builds, $release->build, "class='form-control chosen' multiple"); ?></td><td></td>
           </tr>
           <tr>
             <th><?php echo $lang->release->date;?></th>
diff --git a/module/release/config.php b/module/release/config.php
index e49f950c9e..7e52377cd7 100644
--- a/module/release/config.php
+++ b/module/release/config.php
@@ -3,7 +3,7 @@ $config->release = new stdclass();
 $config->release->create = new stdclass();
 $config->release->edit   = new stdclass();
 $config->release->create->requiredFields = 'name,date';
-$config->release->edit->requiredFields   = 'name,build,date';
+$config->release->edit->requiredFields   = 'name,date';
 
 $config->release->editor = new stdclass();
 $config->release->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 2b5d9dd9c0..81723c68b5 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -30,7 +30,6 @@ $lang->release->confirmUnlinkBug   = "Möchten Sie diesen Bug löschen?";
 $lang->release->existBuild         = '『Build』『%s』 existiert bereits. Sie können den 『name』 ändern oder ein anderes 『build』 wählen.';
 $lang->release->noRelease          = 'Keine Releases. ';
 $lang->release->errorDate          = 'The release date should not be greater than today.';
-$lang->release->tips               = 'If no build is selected for a release, a build with the same name as the release is created by default.';
 
 $lang->release->basicInfo = 'Basis Info';
 
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index c480cbd021..8afd780c5e 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -30,7 +30,6 @@ $lang->release->confirmUnlinkBug   = "Do you want to remove this bug?";
 $lang->release->existBuild         = '『Build』『%s』existed. You could change『name』or choose a『build』.';
 $lang->release->noRelease          = 'No releases yet.';
 $lang->release->errorDate          = 'The release date should not be greater than today.';
-$lang->release->tips               = 'If no build is selected for a release, a build with the same name as the release is created by default.';
 
 $lang->release->basicInfo = 'Basic Info';
 
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index ca2d60eb54..c27bfe6121 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -30,7 +30,6 @@ $lang->release->confirmUnlinkBug   = "Voulez-vous retirer ce bug de la release ?
 $lang->release->existBuild         = '『Build』『%s』existant. Vous pouvez changer『name』ou choisir un『build』.';
 $lang->release->noRelease          = 'Pas de release à ce jour.';
 $lang->release->errorDate          = "La date de release ne doit pas être supérieure à aujourd'hui.";
-$lang->release->tips               = 'If no build is selected for a release, a build with the same name as the release is created by default.';
 
 $lang->release->basicInfo = 'Infos de Base';
 
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 57af6338f2..1d1db7edca 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -30,7 +30,6 @@ $lang->release->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->release->existBuild         = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
 $lang->release->noRelease          = '暂时没有发布。';
 $lang->release->errorDate          = '发布日期不能大于今天。';
-$lang->release->tips               = '如果发布未选择任何版本，系统会默认创建一个和该发布同名的版本。';
 
 $lang->release->basicInfo = '基本信息';
 
diff --git a/module/release/model.php b/module/release/model.php
index 90f4b12acc..786703b0ac 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -182,45 +182,19 @@ class releaseModel extends model
             ->remove('allchecker,files,labels,uid,sync')
             ->get();
 
-        /* Auto create build when release is not link build. */
-        if(empty($release->build) and $release->name)
+        /* Auto create shadow build. */
+        if($release->name)
         {
-            $build = $this->dao->select('*')->from(TABLE_BUILD)
-                ->where('deleted')->eq('0')
-                ->andWhere('name')->eq($release->name)
-                ->andWhere('product')->eq($productID)
-                ->andWhere('branch')->eq($branch)
-                ->fetch();
-            if($build)
-            {
-                return dao::$errors['build'] = sprintf($this->lang->release->existBuild, $release->name);
-            }
-            else
-            {
-                $build = new stdclass();
-                $build->project     = $projectID;
-                $build->product     = (int)$productID;
-                $build->branch      = (int)$branch;
-                $build->name        = $release->name;
-                $build->date        = $release->date;
-                $build->builder     = $this->app->user->account;
-                $build->desc        = $release->desc;
-                $build->execution   = 0;
-                $build->createdBy   = $this->app->user->account;
-                $build->createdDate = helper::now();
+            $shadowBuild = new stdclass();
+            $shadowBuild->product      = $release->product;
+            $shadowBuild->builds       = $release->build;
+            $shadowBuild->name         = $release->name;
+            $shadowBuild->createdBy    = $this->app->user->account;
+            $shadowBuild->createdDate  = helper::now();
+            $this->dao->insert(TABLE_BUILD)->data($shadowBuild)->exec();
 
-                $build = $this->loadModel('file')->processImgURL($build, $this->config->release->editor->create['id']);
-                $this->app->loadLang('build');
-                $this->dao->insert(TABLE_BUILD)->data($build)
-                    ->autoCheck()
-                    ->check('name', 'unique', "product = {$productID} AND branch = {$branch} AND deleted = '0'")
-                    ->batchCheck($this->config->release->create->requiredFields, 'notempty')
-                    ->exec();
-                if(dao::isError()) return false;
-
-                $buildID = $this->dao->lastInsertID();
-                $release->build = $buildID;
-            }
+            if(dao::isError()) return false;
+            $release->shadow = $this->dao->lastInsertID();
         }
 
         if($release->build)
@@ -249,6 +223,7 @@ class releaseModel extends model
             $release->branch  = ',' . trim(implode(',', $branches), ',') . ',';
             $release->project = ',' . trim(implode(',', $projects), ',') . ',';
         }
+
         $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_RELEASE)->data($release)
             ->autoCheck()
@@ -258,7 +233,7 @@ class releaseModel extends model
 
         if(dao::isError())
         {
-            if(!empty($buildID)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($buildID)->exec();
+            if(!empty($release->shadow)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($release->shadow)->exec();
             return false;
         }
 
@@ -266,7 +241,7 @@ class releaseModel extends model
 
         if(dao::isError())
         {
-            if(!empty($buildID)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($buildID)->exec();
+            if(!empty($release->shadow)) $this->dao->delete()->from(TABLE_BUILD)->where('id')->eq($release->shadow)->exec();
         }
         else
         {
@@ -310,7 +285,6 @@ class releaseModel extends model
         $oldRelease = $this->getById($releaseID);
 
         $release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
-            ->add('id', $releaseID)
             ->setDefault('build',  '')
             ->setDefault('mailto', '')
             ->setDefault('deleteFiles', array())
@@ -346,6 +320,7 @@ class releaseModel extends model
             ->exec();
         if(!dao::isError())
         {
+            if($release->build != $oldRelease->build) $this->dao->update(TABLE_BUILD)->set('builds')->eq($release->build)->where('id')->eq($oldRelease->shadow)->exec();
             $this->file->processFile4Object('release', $oldRelease, $release);
             return common::createChanges($oldRelease, $release);
         }
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 86a23ef7bd..0168a431e5 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -69,13 +69,15 @@
       ?>
       <?php foreach($releases as $release):?>
       <?php $canBeChanged = common::canBeChanged('release', $release);?>
-      <?php $buildCount    = count($release->builds);?>
+      <?php $buildCount   = count($release->builds);?>
+      <?php $rowspan      = $buildCount > 1 ? "rowspan='{$buildCount}'" : '';?>
       <?php $i = 1;?>
+      <?php if($buildCount == 0) $release->builds = array('');?>
       <?php foreach($release->builds as $build):?>
       <tr data-type='<?php echo $release->status;?>'>
         <?php if($i == 1):?>
-        <td rowspan="<?php echo $buildCount;?>"><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
-        <td rowspan="<?php echo $buildCount;?>">
+        <td <?php echo $rowspan?>><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
+        <td <?php echo $rowspan?>>
           <?php
           $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
           echo html::a(inlink('view', "release=$release->id"), $release->name, '', "title='$release->name'") . $flagIcon;
@@ -83,6 +85,7 @@
         </td>
         <?php endif;?>
         <td>
+          <?php if($buildCount):?>
           <?php if($product->type != 'normal'):?>
           <span class='label label-outline label-badge'><?php echo $build->branchName;?></span>
           <?php endif;?>
@@ -93,16 +96,17 @@
           if($moduleName == 'build' and $this->execution->checkPriv($build->execution))    $canClickable = true;
           echo $canClickable ? html::a($this->createLink($moduleName, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'") : $build->name;
           ?>
+        <?php endif;?>
         </td>
-        <td><?php echo $build->projectName;?></td>
+        <td><?php if($buildCount) echo $build->projectName;?></td>
         <?php if($i == 1):?>
         <?php $status = $this->processStatus('release', $release);?>
-        <td class='c-status text-center' title='<?php echo $status;?>' rowspan="<?php echo $buildCount;?>">
+        <td class='c-status text-center' title='<?php echo $status;?>' <?php echo $rowspan?>>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
         </td>
-        <td class='text-center' rowspan="<?php echo $buildCount;?>"><?php echo $release->date;?></td>
-        <?php foreach($extendFields as $extendField) echo "<td rowspan='{$buildCount}'>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
-        <td class='c-actions' rowspan="<?php echo $buildCount;?>"><?php echo $this->release->buildOperateMenu($release, 'browse');?></td>
+        <td class='text-center' <?php echo $rowspan?>><?php echo $release->date;?></td>
+        <?php foreach($extendFields as $extendField) echo "<td $rowspan>" . $this->loadModel('flow')->getFieldValue($extendField, $release) . "</td>";?>
+        <td class='c-actions' <?php echo $rowspan?>><?php echo $this->release->buildOperateMenu($release, 'browse');?></td>
         <?php endif;?>
       </tr>
       <?php $i++;?>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 3b1a30c5e3..b9ef2b61dd 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -36,9 +36,7 @@
           <tr>
             <th><?php echo $lang->release->build;?></th>
             <td><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple");?></td>
-            <td>
-              <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->release->tips;?>"></icon>
-            </td>
+            <td></td>
           </tr>
           <tr>
             <th><?php echo $lang->release->date;?></th>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index d203e03e18..d973f33ef3 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->release->build;?></th>
-            <td><?php echo html::select('build[]', $builds, $release->build, "class='form-control chosen' required multiple"); ?></td>
+            <td><?php echo html::select('build[]', $builds, $release->build, "class='form-control chosen' multiple"); ?></td>
           </tr>
           <tr>
             <th><?php echo $lang->release->date;?></th>

From ef60d89f47acfb836186bc08ca945fb26bd00c98 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 18 Nov 2022 02:55:33 +0000
Subject: [PATCH 076/129]  * Fix bug #29653.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 6daa846c64..db8593219c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1608,7 +1608,8 @@ class execution extends control
      */
     public function create($projectID = '', $executionID = 0, $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '')
     {
-        if($this->app->tab == 'doc') unset($this->lang->doc->menu->execution['subMenu']);
+        if($this->app->tab == 'doc')     unset($this->lang->doc->menu->execution['subMenu']);
+        if($this->app->tab == 'project') $this->project->setMenu($projectID);
 
         $project = $this->project->getByID($projectID);
         if(!empty($project) and $project->model == 'kanban')

From fb9aa7d0ddddadd657a8ee913c8840da527d324d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Fri, 18 Nov 2022 10:57:15 +0800
Subject: [PATCH 077/129]  * code for task #76438.

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

diff --git a/module/release/control.php b/module/release/control.php
index 346e23fb7a..16e5e2e7dc 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -525,7 +525,7 @@ class release extends control
         }
         else
         {
-            $allStories = $this->story->getExecutionStories($executionIdList, $build->product, 0, 't1.`order`_desc', 'byBranch', $release->branch, 'story', $release->stories, $pager);
+            $allStories = $this->story->getExecutionStories($executionIdList, $release->product, 0, 't1.`order`_desc', 'byBranch', $release->branch, 'story', $release->stories, $pager);
         }
 
         $this->view->allStories     = $allStories;

From ff6730dcbd496bc56b7de82bb31c19c55276ac60 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Fri, 18 Nov 2022 03:01:40 +0000
Subject: [PATCH 078/129] * Fix bug #29942.

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

diff --git a/module/my/control.php b/module/my/control.php
index 5862cca858..b95ee5f574 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -127,7 +127,7 @@ class my extends control
         $storyCount           = $assignedToStoryCount + $reviewByStoryCount;
 
         $requirementCount = 0;
-        $isOpenedURAndSR  = $this->config->URAndSR;
+        $isOpenedURAndSR  = $this->config->URAndSR ? 1 : 0;
         if($isOpenedURAndSR)
         {
             /* Get the number of requirements assigned to me. */

From 1b10f6141a380d8988b8ee4c593c57d608355d37 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 18 Nov 2022 03:10:12 +0000
Subject: [PATCH 079/129] * Fix bug foe feedback #1468

---
 module/bug/js/common.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 4df2463255..31541c655f 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -882,17 +882,20 @@ function setBranchRelated(branchID, productID, num)
     {
         planID   = $('#plans' + num).val();
         planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID=' + num + '&needCreate=false&expired=&param=skipParent');
+        $.ajaxSettings.async = false;
         $('#plans' + num).parent('td').load(planLink, function()
         {
             $('#plans' + num).chosen();
-            if(planID == 1)
+            var firstBugID = $('.table-form tbody').first('tr').find('input[id^=bugIDList]').val();
+            if(num == firstBugID)
             {
-                $(this).find('option').each(function()
+                $('#plans' + firstBugID).find('option').each(function()
                 {
                     if($(this).val() == 'ditto') $(this).remove();
+                    $('#plans' + firstBugID).trigger('chosen:updated');
                 });
-                $('#plans' + num).chosen().trigger('chosen:updated');
             }
         });
+        $.ajaxSettings.async = true;
     }
 }

From a105dc784598e992f49ad2dbca89059066f3dfa9 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 18 Nov 2022 11:17:09 +0800
Subject: [PATCH 080/129] * Fix task #76459

---
 module/project/js/create.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/module/project/js/create.js b/module/project/js/create.js
index 08a40c7a5d..7defd02346 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -5,6 +5,18 @@ $(function()
         const hasProduct = $('[name=hasProduct]:checked').val();
 
         $('#productTitle, #linkPlan').closest('tr').toggle(hasProduct == 1);
+
+        if(hasProduct == 0) $('.division').addClass('hide');
+
+        if(hasProduct == 1)
+        {
+            var chosenProducts = 0;
+            $("#productsBox select[name^='products']").each(function()
+            {
+                if($(this).val() > 0) chosenProducts ++;
+            });
+            if(chosenProducts > 1) $('.division').removeClass('hide');
+        }
     });
 
     $('[name=hasProduct]').change();

From 8bc0455d368e3c5fa57bba551d8bf21c3ea625ed Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 18 Nov 2022 03:21:58 +0000
Subject: [PATCH 081/129]  * Fix bug #29948.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 129b2aa23c..bf28b17f4c 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5091,7 +5091,7 @@ class executionModel extends model
         $this->config->execution->all->search['actionURL'] = $actionURL;
 
         $projectPairs  = array(0 => '');
-        $projectPairs += $this->loadModel('project')->getPairsByProgram();
+        $projectPairs += $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', '', '', 'multiple');
         $this->config->execution->all->search['params']['project']['values'] = $projectPairs + array('all' => $this->lang->execution->allProject);
 
         $this->loadModel('search')->setSearchParams($this->config->execution->all->search);

From 22499f1f96da781aa28a6b9f2d6625341f711f6a Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 11:22:09 +0800
Subject: [PATCH 082/129] * Fix bug#29990.

---
 module/project/view/ajaxgetdropmenu.html.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 14a3cbb55f..768ab1d93b 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -83,6 +83,10 @@ foreach($projects as $programID => $programProjects)
         {
             $link = helper::createLink('project', 'index', "projectID=%s");
         }
+        elseif(empty($project->hasProduct) and $module == 'project' and $method == 'manageproducts')
+        {
+            $link = helper::createLink('project', 'index', "projectID=%s");
+        }
         elseif(empty($project->multiple))
         {
             $link = helper::createLink('project', 'index', "projectID=%s");

From fa03cbe0fce061489f43dd5dde44f99e9f7c7ce1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 18 Nov 2022 11:23:33 +0800
Subject: [PATCH 083/129] * Fix bug #29974.

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

diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index 422caa127e..2835c79089 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -43,7 +43,7 @@
                         $selected       = ($branchName == $branchID and $branchOrTag == 'branch') ? 'selected' : '';
                         $base64BranchID = helper::safe64Encode(base64_encode($branchName));
                         $branchLink     = $this->createLink('repo', 'browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID");
-                        echo "<li data-idx='$branchName' data-id='branch-$branchName'><a href='$branchLink' id='branch-$branchName' class='$selected branch-or-tag text-ellipsis' title='$branchName' data-key='$branchName'>$branchName</a></li>";
+                        echo "<li data-idx='$branchName' data-id='branch-$branchName'><a href='$branchLink' data-app='{$app->tab}' id='branch-$branchName' class='$selected branch-or-tag text-ellipsis' title='$branchName' data-key='$branchName'>$branchName</a></li>";
                     }
                     ?>
                   </ul>
@@ -58,7 +58,7 @@
                         $selected    = ($tagName == $branchID and $branchOrTag == 'tag') ? 'selected' : '';
                         $base64TagID = helper::safe64Encode(base64_encode($tagName));
                         $tagLink     = $this->createLink('repo', 'browse', "repoID=$repoID&branchID=$base64TagID&objectID=$objectID&path=&revision=HEAD&refresh=0&branchOrTag=tag");
-                        echo "<li data-idx='$tagName' data-id='tag-$tagName'><a href='$tagLink' id='tag-$tagName' class='$selected branch-or-tag text-ellipsis' title='$tagName' data-key='$tagName'>$tagName</a></li>";
+                        echo "<li data-idx='$tagName' data-id='tag-$tagName'><a href='$tagLink' id='tag-$tagName' class='$selected branch-or-tag text-ellipsis' title='$tagName' data-key='$tagName' data-app='{$app->tab}'>$tagName</a></li>";
                     }
                     ?>
                   </ul>

From f551d44dc83d31695b1c20d6b78596eceb49d70a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 18 Nov 2022 11:26:18 +0800
Subject: [PATCH 084/129] * Modify pri style.

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

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 57b9400353..8fd3001d99 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -319,7 +319,11 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->pri;?></th>
-                  <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
+                  <td>
+                    <?php if($story->pri):?>
+                    <span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span>
+                    <?php endif;?>
+                  </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->estimate;?></th>

From ef32ff16ecadc416442b31844f8c0876ccabc010 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 18 Nov 2022 03:51:12 +0000
Subject: [PATCH 085/129] * Adjust code for feedback #1468

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

diff --git a/module/productplan/model.php b/module/productplan/model.php
index e00c1a59b3..c2654d796b 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -255,6 +255,7 @@ class productplanModel extends model
 
         $plans     = $this->reorder4Children($plans);
         $planPairs = array();
+        $mainplan  = array();
         $this->app->loadLang('bug');
         $this->app->loadLang('branch');
         foreach($plans as $plan)

From 50975af5586f412e3ac65ef639c4aed772b3a133 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 18 Nov 2022 04:02:20 +0000
Subject: [PATCH 086/129]  * Fix bug #29977.

---
 module/bug/control.php                   | 8 ++++++--
 module/bug/view/ajaxgetdropmenu.html.php | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7c12932430..77aac56822 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2425,6 +2425,12 @@ class bug extends control
         $products = array();
         if(!empty($extra)) $products = $this->product->getProducts($extra, 'all', 'program desc, line desc, ');
 
+        if($this->config->systemMode == 'ALM')
+        {
+            $this->view->programs = $this->loadModel('program')->getPairs(true);
+            $this->view->lines    = $this->product->getLinePairs();
+        }
+
         $this->view->link      = $this->product->getProductLink($module, $method, $extra);
         $this->view->productID = $productID;
         $this->view->module    = $module;
@@ -2432,8 +2438,6 @@ class bug extends control
         $this->view->extra     = $extra;
         $this->view->products  = $products;
         $this->view->projectID = $this->session->project;
-        $this->view->programs  = $this->loadModel('program')->getPairs(true);
-        $this->view->lines     = $this->product->getLinePairs();
         $this->display();
     }
 
diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php
index c4c129476a..af69f3582d 100644
--- a/module/bug/view/ajaxgetdropmenu.html.php
+++ b/module/bug/view/ajaxgetdropmenu.html.php
@@ -22,8 +22,8 @@ $productsHtml   = count($products) > 1 ? html::a($linkHtml, $this->lang->bug->al
 foreach($products as $product)
 {
     $selected     = $product->id == $productID ? 'selected' : '';
-    $productName  = $product->program ? zget($programs, $product->program, '') . '/' : '';
-    $productName .= $product->line ? zget($lines, $product->line, '') . '/' . $product->name : $product->name;
+    $productName  = ($product->program and $this->config->systemMode == 'ALM') ? zget($programs, $product->program, '') . '/' : '';
+    $productName .= ($this->config->systemMode == 'ALM' and $product->line) ? zget($lines, $product->line, '') . '/' . $product->name : $product->name;
     $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
     $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
     $productsHtml .= html::a($linkHtml, $productName, '', "class='text-primary $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='{$this->app->tab}'");

From 38c7d708f112fcab341b2909147a2ade78658c78 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 18 Nov 2022 13:06:29 +0800
Subject: [PATCH 087/129] * Modify repo branch style.

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

diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css
index 9a9bbc3e37..0bd3a9ae80 100644
--- a/module/repo/css/browse.css
+++ b/module/repo/css/browse.css
@@ -13,7 +13,7 @@
 #branchList {line-height: 25px;}
 #branchList .hide-in-search, #branchList .tree ul {padding-left: 20px;}
 .tree li.has-list.open:before {border-left: none;}
-.tree li {padding: 0;}
+#branchList .tree li {padding: 0;}
 .branch-or-tag {border-radius: 4px;}
 
 .c-name {min-width: 150px;}

From a2db4e6f778b986ce0afab7b8cda8f73f7077f55 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 13:36:33 +0800
Subject: [PATCH 088/129] * Fix bug#29677.

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

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 2bb6a20fa9..9d06db8cdc 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -403,7 +403,7 @@ $config->pipelineTypeList = array('gitlab', 'gogs', 'gitea', 'jenkins', 'sonarqu
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
-$config->programPriv->noSprint  = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder');
+$config->programPriv->noSprint  = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease');
 $config->programPriv->scrum     = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
 $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('task', 'workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
 

From 930b60756eb6b058d2db9a1969837f068ccd5709 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 13:45:38 +0800
Subject: [PATCH 089/129] * Fix bug#29678.

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

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 9d06db8cdc..c3eb49d51b 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -403,7 +403,7 @@ $config->pipelineTypeList = array('gitlab', 'gogs', 'gitea', 'jenkins', 'sonarqu
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
-$config->programPriv->noSprint  = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease');
+$config->programPriv->noSprint  = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'requirement');
 $config->programPriv->scrum     = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
 $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('task', 'workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
 

From 22b1c539f6dd4be7e4172ee3ae9584467bcc8008 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:00:34 +0800
Subject: [PATCH 090/129] * Modify the execution name width problem in the
 execution list.

---
 module/execution/css/all.css | 2 ++
 module/execution/model.php   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 1c672bb874..a9bb635b20 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -42,3 +42,5 @@ canvas {height: 28px;}
 .table thead .c-estimate.text-right,
 .table thead .c-consumed.text-right,
 .table thead .c-left.text-right {padding-right: 8px;}
+#executionsForm td.c-name {padding-right: 5px;}
+#executionsForm td.c-name.delay {padding-right: 55px;}
diff --git a/module/execution/model.php b/module/execution/model.php
index 129b2aa23c..39ac5f0b96 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4944,6 +4944,7 @@ class executionModel extends model
             {
                 $title = " title='{$execution->name}'";
                 if(!empty($execution->children)) $class .= ' has-child';
+                if(isset($execution->delay)) $class .= ' delay';
             }
 
             if($id == 'teamCount')

From 76a2357f564244a8f5a42536c4c5ccb97c405a4c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:12:20 +0800
Subject: [PATCH 091/129] * Fix bug #29973.

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

diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php
index d6b5517f4a..ad182f5974 100644
--- a/module/design/view/linkcommit.html.php
+++ b/module/design/view/linkcommit.html.php
@@ -74,7 +74,9 @@
       </tbody>
     </table>
     <div class='table-footer'>
+      <?php if(!empty($revisions)):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <?php endif;?>
       <div class="table-actions btn-toolbar">
         <?php echo html::submitButton('', '', 'btn btn-primary')?>
       </div>

From 5a0280b50629d1162990c29bfeb961d3b16334f5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:22:08 +0800
Subject: [PATCH 092/129] * Fix bug #29923.

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

diff --git a/module/story/view/linkstories.html.php b/module/story/view/linkstories.html.php
index 587eb6d437..4ba1901542 100644
--- a/module/story/view/linkstories.html.php
+++ b/module/story/view/linkstories.html.php
@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $story->id;?></span>
-      <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title, '_blank', "title='$story->title'");?>
+      <?php echo $story->title;?>
       <?php $title = $story->type == 'story' ? $lang->story->linkStoriesAB : $lang->story->linkRequirementsAB?>
       <small class='text-muted'> <?php echo $lang->arrow . $title;?></small>
     </h2>

From 6faaaf865cb0aee1e3fae26f520c32e7ad492a7c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:24:41 +0800
Subject: [PATCH 093/129] * Fix bug #29847.

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index cc9427c527..f09acee452 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -184,9 +184,6 @@
   </div>
   <div class="main-col">
     <div id='queryBox' data-module='executionStory' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
-      <div class="table-header fixed-right">
-        <nav class="btn-toolbar pull-right setting"></nav>
-      </div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
@@ -217,6 +214,9 @@
       </p>
     </div>
     <?php else:?>
+    <div class="table-header fixed-right">
+      <nav class="btn-toolbar pull-right setting"></nav>
+    </div>
     <form class='main-table table-story skip-iframe-modal' method='post' id='executionStoryForm'>
       <?php
       $datatableId  = $this->moduleName . ucfirst($this->methodName);

From 1c0129945c1bdee7a960b301f33961a84b80197d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Fri, 18 Nov 2022 14:25:24 +0800
Subject: [PATCH 094/129]  * code for task #76439,76440.

---
 module/bug/model.php              | 14 +--------
 module/build/model.php            | 49 +++++++++++++++++++++----------
 module/projectrelease/control.php |  3 +-
 module/release/control.php        |  7 +++--
 module/release/model.php          |  8 ++++-
 module/upgrade/model.php          | 28 ++++++++++++++++++
 6 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 5ab6fa2a76..b4499798f5 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -3490,19 +3490,7 @@ class bugModel extends model
                 echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);
                 break;
             case 'openedBuild':
-                $builds = array_flip($builds);
-                foreach(explode(',', $bug->openedBuild) as $build)
-                {
-                    $buildID = zget($builds, $build, '');
-                    if($buildID == 'trunk')
-                    {
-                        echo $build . ' ';
-                    }
-                    elseif($buildID and common::hasPriv('build', 'view'))
-                    {
-                        echo html::a(helper::createLink('build', 'view', "buildID=$buildID"), $build, '', "title='$bug->openedBuild'") . ' ';
-                    }
-                }
+                echo $bug->openedBuild;
                 break;
             case 'assignedTo':
                 $this->printAssignedHtml($bug, $users);
diff --git a/module/build/model.php b/module/build/model.php
index 2f4cb16f88..3b3f8c0ca9 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -226,7 +226,7 @@ class buildModel extends model
         }
 
         $branchs = strpos($params, 'separate') === false ? "0,$branch" : $branch;
-        $allBuilds = $this->dao->select('t1.id, t1.name, t1.deleted, t2.status as objectStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName, t5.type as productType')->from(TABLE_BUILD)->alias('t1')
+        $allBuilds = $this->dao->select('t1.id, t1.name, t1.date, t1.deleted, t2.status as objectStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName, t5.type as productType')->from(TABLE_BUILD)->alias('t1')
             ->beginIF($objectType === 'execution')->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')->fi()
             ->beginIF($objectType === 'project')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->fi()
             ->leftJoin(TABLE_RELEASE)->alias('t3')->on("FIND_IN_SET(t1.id,t3.build)")
@@ -242,9 +242,10 @@ class buildModel extends model
             ->orderBy('t1.date desc, t1.id desc')->fetchAll('id');
 
         /* Set builds and filter done executions and terminate releases. */
-        $builds = array();
+        $builds      = array();
+        $buildIdList = array();
         $this->app->loadLang('branch');
-        foreach($allBuilds as $key => $build)
+        foreach($allBuilds as $id => $build)
         {
             if(empty($build->releaseID) and (strpos($params, 'nodone') !== false) and ($build->objectStatus === 'done')) continue;
             if((strpos($params, 'noterminate') !== false) and ($build->releaseStatus === 'terminate')) continue;
@@ -252,38 +253,56 @@ class buildModel extends model
             if($build->deleted == 1) $build->name .= ' (' . $this->lang->build->deleted . ')';
             $branchName = $build->branchName ? $build->branchName : $this->lang->branch->main;
 
-            $builds[$key] = $build->name;
-            if(strpos($params, 'withbranch') !== false and $build->productType != 'normal') $builds[$key] = $branchName . '/' . $builds[$key];
+            $buildName = $build->name;
+            if(strpos($params, 'withbranch') !== false and $build->productType != 'normal') $buildName = $branchName . '/' . $buildName;
+
+            $buildIdList[$id] = $id;
+            $builds[$build->date][$id] = $buildName;
         }
 
-        if(!$builds) return $sysBuilds + $selectedBuilds;
+        if(empty($builds)) return $sysBuilds + $selectedBuilds;
 
         /* if the build has been released and replace is true, replace build name with release name. */
         if($replace)
         {
-            $releases = $this->dao->select('t1.id,t1.shadow,t1.build,t1.name')->from(TABLE_RELEASE)->alias('t1')
+            $releases = $this->dao->select('t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t3.name as branchName,t4.type as productType')->from(TABLE_RELEASE)->alias('t1')
                 ->leftJoin(TABLE_BUILD)->alias('t2')->on('FIND_IN_SET(t2.id, t1.build)')
                 ->leftJoin(TABLE_BRANCH)->alias('t3')->on('FIND_IN_SET(t3.id, t1.branch)')
-                ->where('t2.id')->in(array_keys($builds))
+                ->leftJoin(TABLE_PRODUCT)->alias('t4')->on('t1.product=t4.id')
+                ->where('t2.id')->in($buildIdList)
                 ->andWhere('t1.product')->in($products)
-                ->beginIF($branch !== 'all')->andWhere('t3.id')->in($branchs)->fi()
                 ->andWhere('t1.deleted')->eq(0)
+                ->andWhere('t1.shadow')->ne(0)
                 ->fetchAll('id');
             foreach($releases as $release)
             {
+                if($branch !== 'all')
+                {
+                    $inBranch = false;
+                    foreach(explode(',', trim( $release->branch, ',')) as $branchID)
+                    {
+                        if(strpos(",{$branchs},", ",{$branchID},") !== false) $inBranch = true;
+                    }
+                    if(!$inBranch) continue;
+                }
+
                 $releaseName = $release->name;
+                $branchName  = $release->branchName ? $release->branchName : $this->lang->branch->main;
+                if($release->productType != 'normal') $releaseName = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
+                $builds[$release->date][$release->shadow] = $releaseName;
                 foreach(explode(',', trim($release->build, ',')) as $buildID)
                 {
-                    $branchName = $allBuilds[$buildID]->branchName ? $allBuilds[$buildID]->branchName : $this->lang->branch->main;
-                    $buildName  = $releaseName;
-                    if($allBuilds[$buildID]->productType != 'normal') $buildName = (strpos($params, 'withbranch') !== false ? $branchName . '/' : '') . $releaseName;
-                    if($release->shadow and !isset($builds[$release->shadow])) $builds[$release->shadow] = $buildName;
-                    if(isset($builds[$buildID])) unset($builds[$buildID]);
+                    $build = $allBuilds[$buildID];
+                    unset($builds[$build->date][$buildID]);
                 }
             }
         }
 
-        return $sysBuilds + $builds + $selectedBuilds;
+        krsort($builds);
+        $buildPairs = array();
+        foreach($builds as $date => $childBuilds) $buildPairs += $childBuilds;
+
+        return $sysBuilds + $buildPairs + $selectedBuilds;
     }
 
     /**
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 36992ea307..c8e03aaf00 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -367,9 +367,10 @@ class projectrelease extends control
 
             $release = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq((int)$releaseID)->fetch();
             $builds  = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id');
+            $this->loadModel('build')->delete(TABLE_BUILD, $release->shadow);
             foreach($builds as $build)
             {
-                if(empty($build->execution) and empty($build->builds) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id);
+                if(empty($build->execution) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id);
             }
 
             $message = $this->executeHooks($releaseID);
diff --git a/module/release/control.php b/module/release/control.php
index 16e5e2e7dc..73cf7c41b0 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -302,7 +302,11 @@ class release extends control
 
             $release = $this->dao->select('*')->from(TABLE_RELEASE)->where('id')->eq((int)$releaseID)->fetch();
             $build   = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq((int)$release->build)->fetch();
-            if(empty($build->execution)) $this->loadModel('build')->delete(TABLE_BUILD, $build->id);
+            $this->loadModel('build')->delete(TABLE_BUILD, $release->shadow);
+            foreach($builds as $build)
+            {
+                if(empty($build->execution) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id);
+            }
 
             $message = $this->executeHooks($releaseID);
             if($message) $response['message'] = $message;
@@ -320,7 +324,6 @@ class release extends control
                     $response['result']  = 'success';
                     $response['message'] = '';
                     $release = $this->release->getById($releaseID);
-                    $this->dao->update(TABLE_BUILD)->set('deleted')->eq(1)->where('id')->eq($release->build)->andWhere('name')->eq($release->name)->exec();
                 }
 
                 return $this->send($response);
diff --git a/module/release/model.php b/module/release/model.php
index 786703b0ac..f0c219967b 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -189,6 +189,7 @@ class releaseModel extends model
             $shadowBuild->product      = $release->product;
             $shadowBuild->builds       = $release->build;
             $shadowBuild->name         = $release->name;
+            $shadowBuild->date         = $release->date;
             $shadowBuild->createdBy    = $this->app->user->account;
             $shadowBuild->createdDate  = helper::now();
             $this->dao->insert(TABLE_BUILD)->data($shadowBuild)->exec();
@@ -320,7 +321,12 @@ class releaseModel extends model
             ->exec();
         if(!dao::isError())
         {
-            if($release->build != $oldRelease->build) $this->dao->update(TABLE_BUILD)->set('builds')->eq($release->build)->where('id')->eq($oldRelease->shadow)->exec();
+            $shadowBuild = array();
+            if($release->name != $oldRelease->name)   $shadowBuild['name']   = $release->name;
+            if($release->build != $oldRelease->build) $shadowBuild['builds'] = $release->build;
+            if($release->date != $oldRelease->date)   $shadowBuild['date']   = $release->date;
+            if($shadowBuild) $this->dao->update(TABLE_BUILD)->data($shadowBuild)->where('id')->eq($oldRelease->shadow)->exec();
+
             $this->file->processFile4Object('release', $oldRelease, $release);
             return common::createChanges($oldRelease, $release);
         }
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 040fca9474..4fc7b2a4ec 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -575,6 +575,7 @@ class upgradeModel extends model
                 }
                 $this->xuanSetMuteForHiddenGroups();
                 $this->xuanNotifyGroupHiddenUsers();
+                $this->initShadowBuilds();
                 break;
         }
 
@@ -7942,4 +7943,31 @@ class upgradeModel extends model
         $this->loadModel('im')->messageCreateNotify(array_keys($noticeUsers), '', '', $this->lang->upgrade->archiveChangeNoticeContent, 'text', '', array(), $sender);
         return !dao::isError();
     }
+
+    /**
+     * Init shadow builds.
+     *
+     * @access public
+     * @return bool
+     */
+    public function initShadowBuilds()
+    {
+        $releases = $this->dao->select('id,product,shadow,build,name,date,createdBy,createdDate,deleted')->from(TABLE_RELEASE)->where('shadow')->eq(0)->fetchAll();
+        foreach($releases as $release)
+        {
+            $shadowBuild = new stdclass();
+            $shadowBuild->product     = $release->product;
+            $shadowBuild->builds      = $release->build;
+            $shadowBuild->name        = $release->name;
+            $shadowBuild->date        = $release->date;
+            $shadowBuild->createdBy   = $release->createdBy;
+            $shadowBuild->createdDate = $release->createdDate;
+            $shadowBuild->deleted     = $release->deleted;
+            $this->dao->insert(TABLE_BUILD)->data($shadowBuild)->exec();
+
+            $shadowBuildID = $this->dao->lastInsertID();
+            $this->dao->update(TABLE_RELEASE)->set('shadow')->eq($shadowBuildID)->where('id')->eq($release->id)->exec();
+        }
+        return true;
+    }
 }

From c038cce9b5d94a9e1e28bf2c3e4f97432269d0a2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 18 Nov 2022 14:34:20 +0800
Subject: [PATCH 095/129] * Modify feedback for test case import.

---
 module/testcase/js/importfromlib.js         | 1 +
 module/testcase/view/importfromlib.html.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/testcase/js/importfromlib.js b/module/testcase/js/importfromlib.js
index 5a121f4703..054105cd5f 100644
--- a/module/testcase/js/importfromlib.js
+++ b/module/testcase/js/importfromlib.js
@@ -20,6 +20,7 @@ $(function()
             $(select).trigger("chosen:updated");
         }
     });
+    $('.pager a.pager-item').attr('data-app', app);
 })
 
 /**
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index 270123f541..eea6755800 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -102,4 +102,5 @@
 </div>
 <?php js::set('productID', $productID)?>
 <?php js::set('branch', $branch)?>
+<?php js::set('app', $app->tab)?>
 <?php include '../../common/view/footer.html.php';?>

From 427d5947c5d114e2b57ba148c6d5edb7800d5d5d Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Fri, 18 Nov 2022 14:41:25 +0800
Subject: [PATCH 096/129] * Fix bug #29443.

---
 module/tree/js/browse.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 13e3351751..e3bbe5df8a 100644
--- a/module/tree/js/browse.js
+++ b/module/tree/js/browse.js
@@ -63,7 +63,9 @@ function syncProductOrProject(obj, type)
         });
         $('#' + type + 'Module').trigger("chosen:updated");
     })
+
     $('#copyModule').unbind('click');
+    $('#copyModule').removeAttr('onclick');
     $('#copyModule').bind('click', function(){syncModule(obj.value, viewType)});
 }
 

From a5488a96c995a979d858220fee90b7c73a3f060b Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Fri, 18 Nov 2022 06:42:14 +0000
Subject: [PATCH 097/129] * Fix bug #28221.

---
 framework/helper.class.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/framework/helper.class.php b/framework/helper.class.php
index 2b352119c7..38b42bf5b6 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -96,7 +96,7 @@ class helper extends baseHelper
         }
         else
         {
-            if($feature == 'product' or $feature == 'scrum' or $feature == 'waterfall') return strpos(",$config->disabledFeatures,", ",{$feature},") === false;
+            if($feature == 'scrum' or $feature == 'waterfall') return strpos(",$config->disabledFeatures,", ",{$feature},") === false;
 
             $hasFeature       = false;
             $canConfigFeature = false;
@@ -107,7 +107,14 @@ class helper extends baseHelper
                     if($feature == $group or $feature == $module)
                     {
                         $canConfigFeature = true;
-                        if(helper::hasFeature("{$group}_{$module}")) $hasFeature = true;
+                        if($group == 'scrum' or $group == 'waterfall')
+                        {
+                            if(helper::hasFeature("{$group}") and helper::hasFeature("{$group}_{$module}")) $hasFeature = true;
+                        }
+                        else
+                        {
+                            if(helper::hasFeature("{$group}_{$module}")) $hasFeature = true;
+                        }
                     }
                 }
             }

From e0b893114e8b29a125b710449b806ac54f7be6ac Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:46:06 +0800
Subject: [PATCH 098/129] * Fix bug #29842.

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

diff --git a/module/testcase/view/zerocase.html.php b/module/testcase/view/zerocase.html.php
index bdd7e01b09..18279dadad 100644
--- a/module/testcase/view/zerocase.html.php
+++ b/module/testcase/view/zerocase.html.php
@@ -139,7 +139,8 @@
 
         if(common::hasPriv('story', 'batchChangeStage'))
         {
-            echo "<div class='btn-group dropup'>";
+            $class = count($stories) <= 3 ? 'dropdown' : 'dropup';
+            echo "<div class='btn-group $class'>";
             echo html::commonButton($lang->story->stageAB . "<span class='caret'></span>", "data-toggle='dropdown'");
             echo "<ul class='dropdown-menu'>";
             $lang->story->stageList[''] = $lang->null;

From 2607d0e3ac26a1a80860d906561a2ae9b8059edd Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 18 Nov 2022 14:56:56 +0800
Subject: [PATCH 099/129] * Fix bug #24065,23090.

---
 extension/lite/execution/ext/control/create.php   | 1 +
 extension/lite/execution/ext/view/create.html.php | 1 +
 extension/lite/product/ext/view/browse.html.php   | 2 +-
 extension/lite/project/ext/config/lite.php        | 4 +++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/lite/execution/ext/control/create.php b/extension/lite/execution/ext/control/create.php
index f5f9ffd2f1..d1e26bac50 100644
--- a/extension/lite/execution/ext/control/create.php
+++ b/extension/lite/execution/ext/control/create.php
@@ -5,6 +5,7 @@ class myExecution extends execution
     public function create($projectID = '', $executionID = 0, $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '')
     {
         $this->config->execution->create->requiredFields = 'name,code,begin,end';
+        $this->loadModel('project')->setMenu($projectID);
         parent::create($projectID, $executionID, $copyExecutionID, $planID, $confirm, $productID, $extra);
     }
 }
diff --git a/extension/lite/execution/ext/view/create.html.php b/extension/lite/execution/ext/view/create.html.php
index dc5997f855..cecf62f6f1 100644
--- a/extension/lite/execution/ext/view/create.html.php
+++ b/extension/lite/execution/ext/view/create.html.php
@@ -106,6 +106,7 @@
             <?php echo html::hidden("RD", '');?>
             <?php echo html::hidden("type", 'kanban');?>
             <?php echo html::hidden("vision", 'lite');?>
+            <?php echo html::hidden('project', $projectID);?>
           </td>
         </tr>
       </table>
diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php
index 898cc404f8..2a08521f61 100644
--- a/extension/lite/product/ext/view/browse.html.php
+++ b/extension/lite/product/ext/view/browse.html.php
@@ -203,7 +203,7 @@ js::set('URAndSR', $this->config->URAndSR);
       <p>
         <span class="text-muted"><?php echo $storyType == 'story' ? $lang->story->noStory : $lang->story->noRequirement;?></span>
         <?php if(common::canModify('product', $product) and common::hasPriv('story', 'create')):?>
-        <?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType"), "<i class='icon icon-plus'></i> " . $lang->story->createCommon, '', "class='btn btn-info' data-app='$from'");?>
+        <?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType"), "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-info' data-app='$from'");?>
         <?php endif;?>
       </p>
     </div>
diff --git a/extension/lite/project/ext/config/lite.php b/extension/lite/project/ext/config/lite.php
index 587a29764b..24640cf74b 100644
--- a/extension/lite/project/ext/config/lite.php
+++ b/extension/lite/project/ext/config/lite.php
@@ -1,2 +1,4 @@
 <?php
-$config->project->list->exportFields = 'id,code,name,status,budget,PM,desc';
+$config->project->list->exportFields = 'id,code,name,status,PM,desc';
+$config->project->datatable->defaultField = array('id', 'name', 'status', 'PM', 'begin', 'end', 'progress', 'actions');
+unset($config->project->datatable->fieldList['budget']);

From 35fd254797f1ba35ce4df37d1dcd7f3cbdca4750 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 18 Nov 2022 14:57:52 +0800
Subject: [PATCH 100/129] * Fix bug create execution

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

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index eea845b2be..468a57bf4e 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -150,7 +150,7 @@
               <?php $i++;?>
               <?php endforeach;?>
               <?php endforeach;?>
-              <?php if($project->model == 'scrum' or empty($products)):?>
+              <?php if((isset($project->model) and $project->model == 'scrum') or empty($products)):?>
               <div class='col-sm-4'>
                 <div class="input-group">
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>

From 37c83b3d36b75caa8b6880e096223df5a72ae374 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:58:10 +0800
Subject: [PATCH 101/129] * Fix bug #29714.

---
 module/block/view/waterfallganttblock.html.php | 2 +-
 module/programplan/model.php                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/block/view/waterfallganttblock.html.php b/module/block/view/waterfallganttblock.html.php
index 672dfa6916..68b5c3132e 100644
--- a/module/block/view/waterfallganttblock.html.php
+++ b/module/block/view/waterfallganttblock.html.php
@@ -124,7 +124,7 @@
         {
             plan.progress = !plan.tasks.length ? 0 : plan.progress / plan.tasks.length;
             var $plan = $('<div class="gantt-plan"></div>');
-            $plan.append('<div class="strong" title="' + plan.text + '">' + plan.text + '</div>');
+            $plan.append('<div class="strong" title="' + plan.name + '">' + plan.text + '</div>');
             $plans.append($plan);
 
             var $bar = $('<div class="gantt-bar"></div>');
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3402e2c654..cf547525d6 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -187,6 +187,7 @@ class programplanModel extends model
             $data->id            = $plan->id;
             $data->type          = 'plan';
             $data->text          = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
+            $data->name          = $plan->name;
             $data->percent       = $plan->percent;
             $data->attribute     = zget($this->lang->stage->typeList, $plan->attribute);
             $data->milestone     = zget($this->lang->programplan->milestoneList, $plan->milestone);

From 07c1b0cc4535fc86a1b9a0c93bea01a6528ad619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Fri, 18 Nov 2022 15:09:21 +0800
Subject: [PATCH 102/129]  * adjust for create release.

---
 module/build/model.php          |  3 ++-
 module/projectrelease/model.php |  8 ++++++--
 module/release/model.php        | 27 +++++++++++++++++++--------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index 3b3f8c0ca9..e8c4f0c306 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -279,8 +279,9 @@ class buildModel extends model
                 if($branch !== 'all')
                 {
                     $inBranch = false;
-                    foreach(explode(',', trim( $release->branch, ',')) as $branchID)
+                    foreach(explode(',', trim($release->branch, ',')) as $branchID)
                     {
+                        if(empty($branchID)) continue;
                         if(strpos(",{$branchs},", ",{$branchID},") !== false) $inBranch = true;
                     }
                     if(!$inBranch) continue;
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 476d3a353c..9311581055 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -114,13 +114,17 @@ class projectreleaseModel extends model
      */
     public function getReleasedBuilds($projectID)
     {
-        $releases = $this->dao->select('build')->from(TABLE_RELEASE)
+        $releases = $this->dao->select('shadow,build')->from(TABLE_RELEASE)
             ->where('deleted')->eq(0)
             ->andWhere("FIND_IN_SET($projectID, project)")
             ->fetchAll();
 
         $buildIdList = array();
-        foreach($releases as $release) $buildIdList = array_merge($buildIdList, explode(',', trim($release->build, ',')));
+        foreach($releases as $release)
+        {
+            $buildIdList   = array_merge($buildIdList, explode(',', trim($release->build, ',')));
+            $buildIdList[] = $release->shadow;
+        }
         return $buildIdList;
     }
 
diff --git a/module/release/model.php b/module/release/model.php
index f0c219967b..c866d7574b 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -116,19 +116,30 @@ class releaseModel extends model
      */
     public function getReleasedBuilds($productID, $branch = 'all')
     {
-        $builds = $this->dao->select('build')->from(TABLE_RELEASE)
+        $releases = $this->dao->select('branch,shadow,build')->from(TABLE_RELEASE)
             ->where('deleted')->eq(0)
             ->andWhere('product')->eq($productID)
-            ->beginIF($branch !== 'all')->andWhere('branch')->eq($branch)->fi()
-            ->fetchPairs('build');
+            ->fetchAll();
 
-        $buildIDList = array();
-        foreach($builds as $build)
+        $buildIdList = array();
+        foreach($releases as $release)
         {
-            $build = explode(',', $build);
-            $buildIDList = array_merge($buildIDList, $build);
+            if($branch != 'all')
+            {
+                $inBranch = false;
+                foreach(explode(',', trim($release->branch, ',')) as $branchID)
+                {
+                    if(empty($branchID)) continue;
+                    if(strpos(",{$branch},", ",{$branchID},") !== false) $inBranch = true;
+                }
+                if(!$inBranch) continue;
+            }
+
+            $builds = explode(',', $release->build);
+            $buildIdList   = array_merge($buildIdList, $builds);
+            $buildIdList[] = $release->shadow;
         }
-        return $buildIDList;
+        return $buildIdList;
     }
 
     /**

From 0b2bb1a273bc6c5c55645a6356cdbc16f115b2bd Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 18 Nov 2022 15:18:57 +0800
Subject: [PATCH 103/129] * Fix bug #29442#29695

---
 module/execution/model.php             |  4 ++--
 module/project/js/execution.js         |  5 +++++
 module/project/view/execution.html.php | 13 +++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 129b2aa23c..00f4f38d0b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4712,7 +4712,7 @@ class executionModel extends model
         echo "<span class='project-type-label label label-outline $spanClass'>{$this->lang->execution->typeList[$execution->type]}</span> ";
         if(empty($execution->children))
         {
-            echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', 'class="text-ellipsis"');
+            echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', "class='text-ellipsis' title='{$execution->name}'");
             if(!helper::isZeroDate($execution->end))
             {
                 if($execution->status != 'closed')
@@ -4742,7 +4742,7 @@ class executionModel extends model
         echo "<td class='hours text-right' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
         echo '<td>' . html::ring($execution->hours->progress) . '</td>';
         echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
-        echo '<td class="c-actions">';
+        echo '<td class="c-actions text-center">';
         common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
         $class = !empty($execution->children) ? 'disabled' : '';
         common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
index f3d71fc092..49a94fd3f4 100644
--- a/module/project/js/execution.js
+++ b/module/project/js/execution.js
@@ -116,6 +116,11 @@ $(function()
             return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait).replace('%doing%', checkedDoing);
         }
     })
+
+    if(project.division && project.hasProduct && $('#executionList thead th.table-nest-title').width() < 240)
+    {
+        $('#executionList thead th.table-nest-title').width(240)
+    }
 })
 
 window.addEventListener('scroll', this.handleScroll)
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 569d2b4159..88788e85a4 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -1,5 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('projectID', $projectID);?>
+<?php js::set('project', $project);?>
 <?php js::set('edit', $lang->edit);?>
 <?php js::set('selectAll', $lang->selectAll);?>
 <?php js::set('checkedExecutions', $lang->execution->checkedExecutions);?>
@@ -87,15 +88,15 @@
               <?php endif;?>
             </div>
           </th>
-          <?php if($project->division and $project->hasProduct) echo "<th class='text-left c-product'>{$lang->project->product}</th>";?>
+          <?php if($project->division and $project->hasProduct) echo "<th class='text-left w-100px'>{$lang->project->product}</th>";?>
           <th class='c-status text-center'><?php echo $lang->project->status;?></th>
-          <th class='c-user'><?php echo $lang->execution->owner;?></th>
+          <th class='w-50px'><?php echo $lang->execution->owner;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>
           <th class='c-date'><?php echo $lang->programplan->end;?></th>
-          <th class='c-hours text-right'><?php echo $lang->task->estimateAB;?></th>
-          <th class='c-hours text-right'><?php echo $lang->task->consumedAB;?></th>
-          <th class='c-hours text-right'><?php echo $lang->task->leftAB;?> </th>
-          <th class='c-hours'><?php echo $lang->project->progress;?></th>
+          <th class='w-40px text-right'><?php echo $lang->task->estimateAB;?></th>
+          <th class='w-40px text-right'><?php echo $lang->task->consumedAB;?></th>
+          <th class='w-40px text-right'><?php echo $lang->task->leftAB;?> </th>
+          <th class='w-50px'><?php echo $lang->project->progress;?></th>
           <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
           <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
         </tr>

From de8cfb9fec71c3719246d14a5d2395e61c82a4a3 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 18 Nov 2022 15:19:18 +0800
Subject: [PATCH 104/129] * Fix bug#29997.

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

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index eea845b2be..1b3aca4f43 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -113,7 +113,7 @@
         <?php if($isStage):?>
         <tr>
           <th><?php echo $lang->stage->percent;?></th>
-          <td>
+          <td class='required'>
             <div class='input-group'>
               <?php echo html::input('percent', '', "class='form-control'");?>
               <span class='input-group-addon'>%</span>

From 8ef4f02bf8dae78322b27b8f977fd206d7b827dc Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 18 Nov 2022 15:38:59 +0800
Subject: [PATCH 105/129] * Fix bug #29442#29695

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

diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 88788e85a4..211674df6c 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -93,9 +93,9 @@
           <th class='w-50px'><?php echo $lang->execution->owner;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>
           <th class='c-date'><?php echo $lang->programplan->end;?></th>
-          <th class='w-40px text-right'><?php echo $lang->task->estimateAB;?></th>
-          <th class='w-40px text-right'><?php echo $lang->task->consumedAB;?></th>
-          <th class='w-40px text-right'><?php echo $lang->task->leftAB;?> </th>
+          <th class='w-50px text-right'><?php echo $lang->task->estimateAB;?></th>
+          <th class='w-50px text-right'><?php echo $lang->task->consumedAB;?></th>
+          <th class='w-50px text-right'><?php echo $lang->task->leftAB;?> </th>
           <th class='w-50px'><?php echo $lang->project->progress;?></th>
           <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
           <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>

From 29cddd773a53d29ca7146a66fa2dd8ce64b7c2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Fri, 18 Nov 2022 16:25:14 +0800
Subject: [PATCH 106/129]  * fix bug #75779.

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

diff --git a/module/story/control.php b/module/story/control.php
index bf6a2ef71d..5c9c92a74b 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1053,19 +1053,10 @@ class story extends control
             $branchTagOption = array();
             $products        = array();
 
-            if($executionID)
-            {
-                /* The stories of project or execution. */
-                $execution = $this->execution->getByID($executionID);
-                $products  = $this->loadModel('product')->getProducts($executionID);
-            }
-            else
-            {
-                /* The stories of my. */
-                $productIdList = array();
-                foreach($stories as $story) $productIdList[$story->product] = $story->product;
-                $products = $this->product->getByIdList($productIdList);
-            }
+            /* Get product id list by the stories. */
+            $productIdList = array();
+            foreach($stories as $story) $productIdList[$story->product] = $story->product;
+            $products = $this->product->getByIdList($productIdList);
 
             foreach($products as $storyProduct)
             {
@@ -1133,8 +1124,6 @@ class story extends control
             }
         }
 
-        $this->view->position[]        = $this->lang->story->common;
-        $this->view->position[]        = $this->lang->story->batchEdit;
         $this->view->title             = $this->lang->story->batchEdit;
         $this->view->users             = $users;
         $this->view->priList           = array('0' => '', 'ditto' => $this->lang->story->ditto) + $this->lang->story->priList;

From d264eb022cb49648ffd85b048e5343158d7b4fd5 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Fri, 18 Nov 2022 16:03:03 +0800
Subject: [PATCH 107/129] * Fix bug #29687.

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

diff --git a/module/bug/control.php b/module/bug/control.php
index 7c12932430..f52c5b55c3 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2353,6 +2353,8 @@ class bug extends control
 
         if($this->app->tab == 'project' or $this->app->tab == 'execution')
         {
+            $execution = $this->loadModel('execution')->getByID($executionID);
+            if(empty($execution->multiple)) $this->config->bug->exportFields = str_replace('execution,', '', $this->config->bug->exportFields);
             if($product->shadow) $this->config->bug->exportFields = str_replace('product,', '', $this->config->bug->exportFields);
         }
 

From efb20b02d8032e410c2674ba2709b2d0b1586bbb Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 21 Nov 2022 00:01:24 +0000
Subject: [PATCH 108/129] * Adjust code for feedback #1468.

---
 module/productplan/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/productplan/model.php b/module/productplan/model.php
index c2654d796b..f014d79f54 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -255,7 +255,7 @@ class productplanModel extends model
 
         $plans     = $this->reorder4Children($plans);
         $planPairs = array();
-        $mainplan  = array();
+        $mainPlan  = array();
         $this->app->loadLang('bug');
         $this->app->loadLang('branch');
         foreach($plans as $plan)
@@ -267,11 +267,11 @@ class productplanModel extends model
             if($plan->productType != 'normal') $planPairs[$plan->id] = ($plan->branchName ? $plan->branchName : $this->lang->branch->main) . ' / ' . $planPairs[$plan->id];
             if(empty($plan->branchName))
             {
-                $mainplan = $planPairs[$plan->id];
+                $mainPlan = $planPairs[$plan->id];
                 unset($planPairs[$plan->id]);
             }
         }
-        array_splice($planPairs, 0, 0, $mainplan);
+        array_splice($planPairs, 0, 0, $mainPlan);
         return array('' => '', 'ditto' => $this->lang->bug->ditto) + $planPairs;
     }
 

From 16df34b4aefbcbe81ea5b6ccd63f1744a3b74f4d Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 21 Nov 2022 00:40:29 +0000
Subject: [PATCH 109/129] * Adjust the standard sql.

---
 db/standard/zentao18.0.beta1.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/standard/zentao18.0.beta1.sql b/db/standard/zentao18.0.beta1.sql
index 03eda84c01..2f014929d2 100644
--- a/db/standard/zentao18.0.beta1.sql
+++ b/db/standard/zentao18.0.beta1.sql
@@ -2280,6 +2280,7 @@ CREATE TABLE `zt_release` (
   `project` varchar(255) NOT NULL,
   `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `branch` varchar(255) NOT NULL,
+  `shadow` mediumint(8) unsigned NOT NULL default '0',
   `build` varchar(255) NOT NULL,
   `name` varchar(255) NOT NULL DEFAULT '',
   `marker` enum('0','1') NOT NULL DEFAULT '0',

From e993d076703b9c333ac3d689171e809bdb5eb28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 09:28:51 +0800
Subject: [PATCH 110/129]  * fix bug for show build.

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

diff --git a/module/build/model.php b/module/build/model.php
index e368fbed59..f4ab227ef9 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -282,7 +282,7 @@ class buildModel extends model
                     $inBranch = false;
                     foreach(explode(',', trim($release->branch, ',')) as $branchID)
                     {
-                        if(empty($branchID)) continue;
+                        if($branchID === '') continue;
                         if(strpos(",{$branchs},", ",{$branchID},") !== false) $inBranch = true;
                     }
                     if(!$inBranch) continue;
@@ -294,6 +294,7 @@ class buildModel extends model
                 $builds[$release->date][$release->shadow] = $releaseName;
                 foreach(explode(',', trim($release->build, ',')) as $buildID)
                 {
+                    if(!isset($allBuilds[$buildID])) continue;
                     $build = $allBuilds[$buildID];
                     unset($builds[$build->date][$buildID]);
                 }

From adb1434d5b8f6ec3cef95ad26a42595d98daef69 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 21 Nov 2022 09:31:09 +0800
Subject: [PATCH 111/129] * Finish task #76491.

---
 module/story/css/view.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/story/css/view.css b/module/story/css/view.css
index 782054d7ad..2bd6c198d5 100644
--- a/module/story/css/view.css
+++ b/module/story/css/view.css
@@ -13,3 +13,4 @@
 .linkStoryTr > td {padding-left: 0px !important;}
 .removeButton {margin-left: -10px;}
 .resolution {white-space: nowrap; overflow: hidden;}
+.body-modal #mainMenu+#mainContent.main-row {padding: 0px 10px 0;}

From bdb570c00eac177ec2c48594b4d0bb205d396f39 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Mon, 21 Nov 2022 09:43:56 +0800
Subject: [PATCH 112/129] * Fix bug#29461.

---
 module/datatable/control.php         | 3 +++
 module/execution/view/bug.html.php   | 2 ++
 module/execution/view/story.html.php | 3 +++
 module/project/view/bug.html.php     | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/module/datatable/control.php b/module/datatable/control.php
index 7f3d7b1291..5ff84da3f2 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -106,6 +106,7 @@ class datatable extends control
 
             if(!$project->multiple) unset($cols['execution']);
             if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']);
+            if(!$project->hasProduct) unset($cols['branch']);
         }
 
         if($moduleName == 'execution' and $method == 'bug')
@@ -113,12 +114,14 @@ class datatable extends control
             $execution = $this->loadModel('execution')->getByID($this->session->execution);
             $project   = $this->loadModel('project')->getByID($execution->project);
             if(!$project->hasProduct and $project->model != 'scrum') unset($cols['plan']);
+            if(!$project->hasProduct) unset($cols['branch']);
         }
 
         if($moduleName == 'execution' and $method == 'story')
         {
             $execution = $this->loadModel('execution')->getByID($this->session->execution);
             if(!$execution->hasProduct and !$execution->multiple) unset($cols['plan']);
+            if(!$execution->hasProduct) unset($cols['branch']);
         }
 
         $this->view->cols    = $cols;
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 88c458f49d..32aa5c5ac2 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -125,6 +125,7 @@
             foreach($setting as $value)
             {
                 if(!$project->hasProduct and $project->model != 'scrum' and $value->id == 'plan') continue;
+                if(!$project->hasProduct and $value->id == 'branch') continue;
                 if($value->show)
                 {
                     if(common::checkNotCN() and $value->id == 'severity')  $value->name = $lang->bug->severity;
@@ -154,6 +155,7 @@
           <?php foreach($setting as $value)
           {
               if(!$project->hasProduct and $project->model != 'scrum' and $value->id == 'plan') continue;
+              if(!$project->hasProduct and $value->id == 'branch') continue;
               $this->bug->printCell($value, $bug, $users, $builds, $branchOption, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table', $projectPairs);
           }
           ?>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index f09acee452..2bb0854b82 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -254,6 +254,7 @@
           <?php
           foreach($setting as $key => $value)
           {
+              if(!$execution->hasProduct and $value->id == 'branch') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
@@ -274,6 +275,7 @@
           <tr id="story<?php echo $story->id;?>" data-id='<?php echo $story->id;?>' data-order='<?php echo $story->order ?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0)?>'>
           <?php foreach($setting as $key => $value)
           {
+              if(!$execution->hasProduct and $value->id == 'branch') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
@@ -290,6 +292,7 @@
           <tr class='table-children<?php echo $class;?> parent-<?php echo $story->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
           <?php foreach($setting as $key => $value)
           {
+              if(!$execution->hasProduct and $value->id == 'branch') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 44d489418a..2efb621a8e 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -99,6 +99,7 @@
             foreach($setting as $key => $value)
             {
                 if(!$project->hasProduct and $project->model != 'scrum' and $value->id == 'plan') continue;
+                if(!$project->hasProduct and $value->id == 'branch') continue;
 
                 if($value->show)
                 {
@@ -119,6 +120,7 @@
         <?php foreach($setting as $value)
         {
             if(!$project->hasProduct and $project->model != 'scrum' and $value->id == 'plan') continue;
+            if(!$project->hasProduct and $value->id == 'branch') continue;
             $this->bug->printCell($value, $bug, $users, $builds, $branchOption, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table', $projectPairs);
         }
         ?>

From 182f1abc9a8e608f334894f22c950b818da76166 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 21 Nov 2022 01:51:24 +0000
Subject: [PATCH 113/129] * Fix bug #30003.

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

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 4fc7b2a4ec..22aef7f208 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7558,7 +7558,6 @@ class upgradeModel extends model
 
             $projectID = $this->dao->lastInsertId();
 
-            $this->action->create('project', $projectID, 'openedbysystem');
             if($project->status == 'closed') $this->action->create('project', $projectID, 'closedbysystem');
 
             $project->id = $projectID;
@@ -7568,6 +7567,14 @@ class upgradeModel extends model
             $this->processMergedData($programID, $projectID, '', $productIdList, array($sprint->id));
 
             if($fromMode == 'classic') $this->dao->update(TABLE_PROJECT)->set('multiple')->eq('0')->where('id')->eq($sprint->id)->exec();
+            $this->dao->update(TABLE_ACTION)
+                ->set('objectID')->eq($projectID)
+                ->set('objectType')->eq('project')
+                ->set('execution')->eq('0')
+                ->set('project')->eq($projectID)
+                ->where('objectType')->eq('execution')
+                ->andWhere('objectID')->eq($sprint->id)
+                ->exec();
         }
 
         $this->fixProjectPath($programID);

From 84b13838201bd41bb3f16cce399f7849bb9b438a Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 21 Nov 2022 02:12:42 +0000
Subject: [PATCH 114/129]  * Display all products of the top program.

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

diff --git a/module/project/control.php b/module/project/control.php
index eba49dd1a7..2d05470023 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2237,13 +2237,14 @@ class project extends control
         $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed');
         if($this->config->systemMode == 'ALM')
         {
+            $topProgramID           = $this->program->getTopByPath($project->path);
             $productsGroupByProgram = $this->product->getProductsGroupByProgram();
 
             $currentProducts = array();
             $otherProducts   = array();
             foreach($productsGroupByProgram as $programID => $programProducts)
             {
-                if($programID != $project->parent)
+                if($programID != $topProgramID)
                 {
                     foreach($programProducts as $productID => $productName)
                     {

From f7d7f68fc9ec0d8b157836158fb8bae2b55b0f5b Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 21 Nov 2022 02:18:59 +0000
Subject: [PATCH 115/129] * Fix bug #30000.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 6b396e9e80..75ed75ee7e 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5112,7 +5112,6 @@ class executionModel extends model
         $_POST = array();
         $_POST['project']     = $projectID;
         $_POST['name']        = $project->name;
-        $_POST['code']        = $project->code;
         $_POST['begin']       = $project->begin;
         $_POST['end']         = $project->end;
         $_POST['status']      = 'wait';
@@ -5126,6 +5125,7 @@ class executionModel extends model
         $_POST['RD']          = '';
         $_POST['multiple']    = '0';
         $_POST['hasProduct']  = $project->hasProduct;
+        if($project->code) $_POST['code'] = $project->code;
 
         $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll();
         foreach($projectProducts as $projectProduct)

From 66bc58139f6d7ffc985d386a84bd56fc1d82336e Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 21 Nov 2022 10:23:28 +0800
Subject: [PATCH 116/129] * Finish task #76486.

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

diff --git a/module/bug/control.php b/module/bug/control.php
index 8f0edd9a6c..e340263ed4 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2048,7 +2048,11 @@ class bug extends control
             if(!$project->hasProduct)
             {
                 unset($this->config->bug->search['fields']['product']);
-                if($project->model != 'scrum') unset($this->config->bug->search['fields']['plan']);
+                if(!$project->multiple)
+                {
+                    unset($this->config->bug->search['fields']['execution']);
+                    unset($this->config->bug->search['fields']['plan']);
+                }
             }
         }
 

From 5811dc886d0b912070bdcf7c17b25bd0041640c0 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 21 Nov 2022 02:23:48 +0000
Subject: [PATCH 117/129] * Fix bug #28274.

---
 module/action/lang/zh-cn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 080aea9711..c75f93a663 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -224,7 +224,7 @@ $lang->action->desc->reopen               = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->merged               = '$date, 由 <strong>$actor</strong> 合并。' . "\n";
 $lang->action->desc->submitreview         = '$date, 由 <strong>$actor</strong> 提交评审。' . "\n";
 $lang->action->desc->ganttmove            = '$date, 由 <strong>$actor</strong> 排序。' . "\n";
-$lang->action->desc->switchtolight        = '$date, 由 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式。' . "\n";
+$lang->action->desc->switchtolight        = '$date, 由于 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式，项目访问控制由项目集内公开调整为私有。' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, 系统判断由于迭代所属项目与$extra取消关联，同步将迭代与$extra取消关联。' . "\n";
 
 /* 用来描述和父子任务相关的操作历史记录。*/

From d0908ccddecfa1c2186703e31e585951215706c6 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Mon, 21 Nov 2022 10:26:37 +0800
Subject: [PATCH 118/129] * Fix bug #29684.

---
 module/bug/js/common.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 31541c655f..9f0d4a336f 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -587,13 +587,13 @@ function loadProjectBuilds(projectID)
 function loadExecutionBuilds(executionID, num)
 {
     if(typeof(num) == 'undefined') num = '';
-    var branch = $('#branch' + num).val();
-
-    if(typeof(branch) == 'undefined') var branch = 0;
-
+    var branch         = $('#branch' + num).val();
     var oldOpenedBuild = $('#openedBuild' + num).val() ? $('#openedBuild' + num).val() : 0;
     var productID      = $('#product' + num).val();
 
+    if(typeof(branch) == 'undefined') var branch = 0;
+    if(typeof(productID) == 'undefined') var productID = 0;
+
     if(page == 'create')
     {
         link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + "&branch=" + branch + "&index=0&needCreate=true");

From 4dce7205acc0b1dd98fa5ec03cecde0e9fa21133 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 21 Nov 2022 10:36:28 +0800
Subject: [PATCH 119/129] * Fix task #76458

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 6b396e9e80..1e9607a938 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -565,6 +565,9 @@ class executionModel extends model
             if($oldExecution->type == 'stage' and $field == 'name') $this->lang->project->name = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->project->name);
         }
 
+        $relationExecutionsID = $this->getRelatedExecutions($executionID);
+        $relationExecutionsID = !empty($relationExecutionsID) ? implode(',', array_keys($relationExecutionsID)) : '';
+
         /* Update data. */
         $this->lang->error->unique = $this->lang->error->repeat;
         $executionProject = isset($execution->project) ? $execution->project : '0';
@@ -574,7 +577,7 @@ class executionModel extends model
             ->checkIF($execution->begin != '', 'begin', 'date')
             ->checkIF($execution->end != '', 'end', 'date')
             ->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
-            ->checkIF(!empty($execution->name), 'name', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `project` = $executionProject and `deleted` = '0'")
+            ->checkIF(!empty($execution->name), 'name', 'unique', "id in ('$relationExecutionsID') and type in ('sprint','stage', 'kanban') and `project` = $executionProject and `deleted` = '0'")
             ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `deleted` = '0'")
             ->checkFlow()
             ->where('id')->eq($executionID)

From bddf9e66025e88d00f314f00bb69a6e006afc646 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 21 Nov 2022 02:37:08 +0000
Subject: [PATCH 120/129] * Fix bug #29561.

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

diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index bc1af1e745..29ad96fe0e 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -110,7 +110,8 @@
     <?php else:?>
     <div class="table-empty-tip">
       <?php $emptyTips = ($app->rawModule == 'execution' and !$project->hasProduct) ? 'projectNoStories' : 'whyNoStories';?>
-      <p><span class="text-muted"><?php echo $lang->{$app->rawModule}->{$emptyTips};?></p>
+      <?php $app->loadLang('projectstory');?>
+      <p><span class="text-muted"><?php echo $project->multiple ? $lang->{$app->rawModule}->{$emptyTips} : $lang->projectstory->whyNoStories;?></p>
     </div>
     <?php endif;?>
   </form>

From d9e22f597687c4b7cea66ba85919da8df4163efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 10:47:36 +0800
Subject: [PATCH 121/129]  * fix bug #29670.

---
 .../execution/view/ajaxgetdropmenu.html.php   |  1 +
 module/project/view/ajaxgetdropmenu.html.php  | 26 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 779e67a96b..0dc5ab2f16 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -82,6 +82,7 @@ foreach($executions as $projectID => $projectExecutions)
         $isKanbanMethod = ((in_array($method, $config->execution->kanbanMethod) and $module == 'execution') or (strpos(',create,edit,', ",$method,") !== false and $module == 'build'));
         if(isset($execution->type) and $execution->type == 'kanban' and !$isKanbanMethod) $executionLink = $kanbanLink;
         if(isset($execution->type) and $execution->type != 'kanban' and strpos(',kanban,cfd,', ",$method,") !== false) $executionLink = $taskLink;
+        if(isset($execution->type) and $execution->type == 'stage' and in_array($module, array('issue', 'risk', 'opportunity', 'pssp', 'auditplan', 'meeting'))) $executionLink = $taskLink;
 
         if($execution->id == $executionID) $currentExecution = $execution;
         $selected = $execution->id == $executionID ? 'selected' : '';
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 768ab1d93b..aae6f062f1 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -57,6 +57,7 @@ $myProjectsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angle
 $normalProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 $closedProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 
+$indexLink = helper::createLink('project', 'index', "projectID=%s");
 foreach($projects as $programID => $programProjects)
 {
     /* Add the program name before project. */
@@ -77,19 +78,36 @@ foreach($projects as $programID => $programProjects)
 
         if($project->model != 'waterfall' and (in_array($module, $config->waterfallModules) or $method == 'track'))
         {
-            $link = helper::createLink('project', 'index', "projectID=%s");
+            $link = $indexLink;
+        }
+        elseif($project->model == 'scrum' and
+            (
+                (in_array($module, array('issue', 'risk', 'meeting')) and !helper::hasFeature("scrum_{$module}")) or
+                ($module == 'report' and $method == 'projectsummary' and !helper::hasFeature("scrum_measrecord"))
+            ))
+        {
+            $link = $indexLink;
+        }
+        elseif($project->model == 'waterfall' and
+            (
+                (in_array($module, array('issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'meeting')) and !helper::hasFeature("waterfall_{$module}")) or
+                ($module == 'pssp' and !helper::hasFeature("waterfall_process")) or
+                ($module == 'report' and $method == 'projectsummary' and !helper::hasFeature("scrum_measrecord"))
+            ))
+        {
+            $link = $indexLink;
         }
         elseif($project->model == 'kanban' and (($module == 'project' and !in_array($method, array('build', 'view', 'manageproducts', 'team', 'whitelist', 'managemembers', 'addwhitelist'))) or $module != 'project'))
         {
-            $link = helper::createLink('project', 'index', "projectID=%s");
+            $link = $indexLink;
         }
         elseif(empty($project->hasProduct) and $module == 'project' and $method == 'manageproducts')
         {
-            $link = helper::createLink('project', 'index', "projectID=%s");
+            $link = $indexLink;
         }
         elseif(empty($project->multiple))
         {
-            $link = helper::createLink('project', 'index', "projectID=%s");
+            $link = $indexLink;
         }
         else
         {

From 8b84363de84fbe861df21c409600114c2f67792c Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 21 Nov 2022 10:58:48 +0800
Subject: [PATCH 122/129] * Fix task #76483

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

diff --git a/module/execution/control.php b/module/execution/control.php
index bd6f5618de..f7d2b2acde 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -250,7 +250,7 @@ class execution extends control
         $this->view->moduleTree   = $this->tree->getTaskTreeMenu($executionID, $productID, $startModuleID = 0, array('treeModel', 'createTaskLink'), $extra);
         $this->view->memberPairs  = $memberPairs;
         $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
-        $this->view->setModule    = true;
+        $this->view->setModule    = !$execution->multiple ? false : true;
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch   = $showBranch;
         $this->view->projectName  = $this->loadModel('project')->getById($execution->project)->name . ' / ' . $execution->name;

From bacdc498f8531fcb113e9f754fcc490c957b56a2 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 21 Nov 2022 11:19:59 +0800
Subject: [PATCH 123/129] * Fix bug #30011.

---
 extension/lite/product/ext/control/browse.php   | 1 +
 extension/lite/product/ext/view/browse.html.php | 1 +
 module/product/js/browse.js                     | 2 +-
 module/product/view/browse.html.php             | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php
index 7fcc313b0d..fd021e27e7 100644
--- a/extension/lite/product/ext/control/browse.php
+++ b/extension/lite/product/ext/control/browse.php
@@ -90,6 +90,7 @@ class product extends control
         $product = $this->product->getById($productID);
 
         /* Get stories. */
+        if($browseType == 'reviewing') $browseType = 'reviewingstory';
         $stories = $this->product->getStories($productID, $branchID, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
 
         /* Display status of branch. */
diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php
index 2a08521f61..3f8207045a 100644
--- a/extension/lite/product/ext/view/browse.html.php
+++ b/extension/lite/product/ext/view/browse.html.php
@@ -39,6 +39,7 @@ js::set('rawModule', $this->app->rawModule);
 js::set('productType', $this->app->tab == 'product' ? $product->type : '');
 js::set('projectHasProduct', $projectHasProduct);
 js::set('URAndSR', $this->config->URAndSR);
+js::set('vision',  $this->config->vision);
 ?>
 <style>
 .btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 79e2d21d56..c52126edd9 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -5,7 +5,7 @@ $(function()
     $('#navbar .nav li').removeClass('active');
     $("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
 
-    if(rawModule == 'projectstory' && !projectHasProduct && URAndSR)
+    if(vision != 'lite' && rawModule == 'projectstory' && !projectHasProduct && URAndSR)
     {
         $('#navbar .nav>li[data-id=story]').addClass('active');
         $('#navbar .nav>li[data-id=story]>a').html($('.active [data-id=' + storyType + ']').text() + '<span class="caret"></span>');
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 022de997f2..49ac4d4a5b 100755
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -38,6 +38,7 @@ js::set('unfoldStories', $unfoldStories);
 js::set('unfoldAll',     $lang->execution->treeLevel['all']);
 js::set('foldAll',       $lang->execution->treeLevel['root']);
 js::set('storyType',     $storyType);
+js::set('vision',        $this->config->vision);
 ?>
 <style>
 .btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}

From cbd21480afa90ad29b668819e0eae9380880ad22 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 21 Nov 2022 11:22:59 +0800
Subject: [PATCH 124/129] * Fix bug #30022

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

diff --git a/module/report/model.php b/module/report/model.php
index b6ff30b900..d8eead8a16 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -823,6 +823,7 @@ class reportModel extends model
         /* Get changed executions in this year. */
         $executions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('deleted')->eq(0)
             ->andwhere('type')->eq('sprint')
+            ->andwhere('multiple')->eq('1')
             ->andWhere('LEFT(begin, 4)', true)->eq($year)
             ->orWhere('LEFT(end, 4)')->eq($year)
             ->markRight(1)

From 3852627523a1d4de55c62b224ecb075f9917e369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 11:30:17 +0800
Subject: [PATCH 125/129]  * fix bug #29557.

---
 module/story/control.php | 2 +-
 module/story/model.php   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 5c9c92a74b..be95803914 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2015,7 +2015,7 @@ class story extends control
      */
     public function batchToTask($executionID = 0, $projectID = 0)
     {
-        if($this->app->tab == 'execution' and $executionID) $this->loadModel('execution')->setMenu($executionID);
+        if($executionID) $this->loadModel('execution')->setMenu($executionID);
 
         if(!empty($_POST['name']))
         {
diff --git a/module/story/model.php b/module/story/model.php
index 81a760f001..72d84a177d 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2724,6 +2724,7 @@ class storyModel extends model
             ->beginIF(!empty($moduleIdList))->andWhere('module')->in($moduleIdList)->fi()
             ->beginIF(!empty($excludeStories))->andWhere('id')->notIN($excludeStories)->fi()
             ->beginIF($status and $status != 'all')->andWhere('status')->in($status)->fi()
+            ->andWhere('vision')->eq($this->config->vision)
             ->andWhere('type')->eq($type)
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)
@@ -2936,6 +2937,7 @@ class storyModel extends model
 
         $stories = $sql->where('t1.product')->in($productID)
             ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t1.vision')->eq($this->config->vision)
             ->andWhere('t1.type')->eq($type)
             ->beginIF($branch != 'all')->andWhere("t1.branch")->eq($branch)->fi()
             ->beginIF($modules)->andWhere("t1.module")->in($modules)->fi()
@@ -2973,6 +2975,7 @@ class storyModel extends model
             ->beginIF($branch)->andWhere("branch")->eq($branch)->fi()
             ->beginIF($modules)->andWhere("module")->in($modules)->fi()
             ->andWhere('deleted')->eq(0)
+            ->andWhere('vision')->eq($this->config->vision)
             ->andWhere('stage')->in('developed,released')
             ->andWhere('status')->ne('closed')
             ->orderBy($orderBy)
@@ -3150,6 +3153,7 @@ class storyModel extends model
             ->where($sql)
             ->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi()
             ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t1.vision')->eq($this->config->vision)
             ->andWhere('t1.type')->eq($type)
             ->orderBy($orderBy)
             ->page($pager, 't1.id')

From 902a88f0e32d00223c2235866aa7de2dca183ffa Mon Sep 17 00:00:00 2001
From: wangjianhua <wangjianhua@easycorp.ltd>
Date: Mon, 21 Nov 2022 11:31:06 +0800
Subject: [PATCH 126/129] * Fix bug #29980.

---
 module/product/model.php         | 22 ++++++++++++++++++++++
 module/repo/control.php          | 14 +++++---------
 module/repo/view/create.html.php |  2 +-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index 896dfb8304..de64d7fa4d 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1228,6 +1228,28 @@ class productModel extends model
         $this->loadModel('search')->setSearchParams($this->config->product->all->search);
     }
 
+    /**
+     * Get project pairs by product.
+     *
+     * @param  array  $productIDList
+     * @param  int    $branch
+     * @param  int    $appendProject
+     * @param  string $status all|closed|unclosed
+     * @access public
+     * @return array
+     */
+    public function getProjectPairsByProductIDList($productIDList, $branch = 0, $appendProject = 0, $status = '')
+    {
+        $projectParis = array();
+        foreach($productIDList as $productID)
+        {
+            $projects     = $this->getProjectPairsByProduct($productID, $branch, $appendProject, $status);
+            $projectParis = $projectParis + $projects;
+        }
+
+        return $projectParis;
+    }
+
     /**
      * Get project pairs by product.
      *
diff --git a/module/repo/control.php b/module/repo/control.php
index 86f044b70a..c8e49b5767 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -139,8 +139,8 @@ class repo extends control
 
         $this->app->loadLang('action');
 
-        $products  = $this->loadModel('product')->getProductPairsByProject($objectID);
-        $products  = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in(array_keys($products))->andWhere('shadow')->eq(0)->fetchPairs('id', 'name'); /* Remove shadow products. */
+        $products = $this->loadModel('product')->getProductPairsByProject($objectID);
+        $products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in(array_keys($products))->andWhere('shadow')->eq(0)->fetchPairs('id', 'name'); // Remove shadow products.
 
         $shadowProduct = null;
         if($this->app->tab == 'project' && $objectID) $shadowProduct = $this->loadModel('product')->getShadowProductByProject($objectID);
@@ -150,7 +150,8 @@ class repo extends control
         $this->view->groups          = $this->loadModel('group')->getPairs();
         $this->view->users           = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
         $this->view->products        = $products;
-        $this->view->relatedProjects = array();
+        $this->view->projects        = $this->loadModel('product')->getProjectPairsByProductIDList(array_keys($products));
+        $this->view->relatedProjects = $this->app->tab == 'project' ? array($objectID) : array();
         $this->view->serviceHosts    = $this->loadModel('gitlab')->getPairs();
         $this->view->objectID        = $objectID;
         $this->view->shadowProduct   = $shadowProduct;
@@ -1250,12 +1251,7 @@ class repo extends control
             ->get();
 
         /* Get all projects that can be accessed. */
-        $accessProjects = array();
-        foreach($postData->products as $productID)
-        {
-            $projects       = $this->loadModel('product')->getProjectPairsByProduct($productID);
-            $accessProjects = $accessProjects + $projects;
-        }
+        $accessProjects = $this->loadModel('product')->getProjectPairsByProductIDList($postData->products);
 
         $selectedProjects = array_intersect(array_keys($accessProjects), $postData->projects);
 
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 7d9a5ae4af..4206b05fd0 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -33,7 +33,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->repo->projects;?></th>
-            <td id='projectContainer'><?php echo html::select('projects[]', $relatedProjects, array(), "class='form-control chosen' multiple");?></td>
+            <td id='projectContainer'><?php echo html::select('projects[]', $projects, $relatedProjects, "class='form-control chosen' multiple");?></td>
           </tr>
           <?php endif;?>
           <tr>

From 111f145d61007d6d8eb9014bf61699ad883f43f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 13:23:13 +0800
Subject: [PATCH 127/129]  * fix bug #29953.

---
 module/todo/control.php |  2 ++
 module/todo/js/view.js  | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/module/todo/control.php b/module/todo/control.php
index c52cf46751..173526d4f4 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -690,10 +690,12 @@ class todo extends control
     {
         $this->session->set('project', $projectID);
 
+        $project    = $this->loadModel('project')->getByID($projectID);
         $executions = $this->loadModel('execution')->getByProject($projectID, 'undone');
         foreach($executions as $id => $execution) $executions[$id] = $execution->name;
 
         echo html::select('execution', $executions, '', "class='form-control chosen'");
+        echo "<script>toggleExecution({$project->multiple});</script>";
     }
 
     /**
diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index d5d566c06b..b0d2614cfc 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -155,3 +155,15 @@ function getProgramByProduct(productID)
         $('#productProgram').val(data);
     })
 }
+
+/**
+ * Toggle show execution.
+ *
+ * @param  bool $multiple
+ * @access public
+ * @return void
+ */
+function toggleExecution(multiple)
+{
+    $('#executionIdBox').closest('tr').toggleClass('hidden', !multiple);
+}

From 7a47096356902272dfc8c72d9b519cea5dfb708d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 14:10:22 +0800
Subject: [PATCH 128/129]  * fix bug #30007.

---
 module/project/view/ajaxgetdropmenu.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index aae6f062f1..6c51b4d224 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -53,9 +53,9 @@ foreach($projects as $programID => $programProjects)
 }
 $projectsPinYin = common::convert2Pinyin($projectNames);
 
-$myProjectsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$normalProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$closedProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$myProjectsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
+$normalProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
+$closedProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
 
 $indexLink = helper::createLink('project', 'index', "projectID=%s");
 foreach($projects as $programID => $programProjects)
@@ -144,7 +144,7 @@ foreach($projects as $programID => $programProjects)
         }
 
         /* If the project is the last one in the program, print the closed label. */
-        if(isset($programs[$programID]) and !isset($programProjects[$index + 1]))
+        if($config->systemMode == 'ALM' and isset($programs[$programID]) and !isset($programProjects[$index + 1]))
         {
             if($projectCounts[$programID]['myProject']) $myProjectsHtml     .= '</ul></li>';
             if($projectCounts[$programID]['others'])    $normalProjectsHtml .= '</ul></li>';

From 07b30d1f7ce95a8d20a7bc1c114010d1a8c7a6a3 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 21 Nov 2022 14:22:42 +0800
Subject: [PATCH 129/129] * Finish task #76953.

---
 doc/CHANGELOG                 | 106 +++++++++++++++++-----------------
 module/misc/lang/zh-cn.php    |   2 +-
 module/project/lang/zh-cn.php |   2 +-
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 29e46ec1e3..09e644ac64 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -39,14 +39,14 @@
 39090 创建不启用迭代的项目时，项目起止日期自动同步到隐藏迭代的起止日期
 38949 产品看板中增加显示非当前项目集的项目信息的开关功能
 38948 项目集看板中增加显示非当前项目集的项目信息的开关功能
-38934 单迭代无产品项目的研发需求增加报表功能
-38931 单迭代无产品项目的权限去掉计划和会议相关的权限
-38928 单迭代无产品项目的版本关联需求和bug时搜索条件去掉所属计划
-38927 单迭代无产品项目增加发布功能
-38925 单迭代无产品项目的研发需求相关页面去掉计划信息
-38924 单迭代无产品项目研发需求看板中去掉关联研发需求的按钮
-38922 单迭代无产品项目中研发需求列表增加细分按钮
-38921 单迭代无产品项目增加用户需求功能
+38934 单迭代项目型项目的研发需求增加报表功能
+38931 单迭代项目型项目的权限去掉计划和会议相关的权限
+38928 单迭代项目型项目的版本关联需求和bug时搜索条件去掉所属计划
+38927 单迭代项目型项目增加发布功能
+38925 单迭代项目型项目的研发需求相关页面去掉计划信息
+38924 单迭代项目型项目研发需求看板中去掉关联研发需求的按钮
+38922 单迭代项目型项目中研发需求列表增加细分按钮
+38921 单迭代项目型项目增加用户需求功能
 38920 将地盘待处理中的评审功能与地盘审批功能进行合并
 38918 无迭代项目的任务列表中，导出数据的字段中所属执行调整为所属项目
 38917 无迭代项目的任务列表中，导出模板的字段中所属执行调整为所属项目
@@ -106,7 +106,7 @@
 38349 从综合模式切到迅捷模式时，敏捷项目根据是否存在机会数据来判断是否开启机会功能
 38347 从综合模式切到迅捷模式时，敏捷项目根据是否存在风险数据来判断是否开启风险功能
 38345 从综合模式切到迅捷模式时，敏捷项目根据是否存在问题数据来判断是否开启问题功能
-38324 项目管理员权限分组中无产品项目的权限特殊处理
+38324 项目管理员权限分组中项目型项目的权限特殊处理
 38281 实现从15版本经典模式直接升级到18本版迅捷模式
 38234 综合模式下如果没有项目集数据，切换迅捷模式时可以不用选择默认项目集
 38231 执行创建阶段类型为需求、设计、总结评审的瀑布项目阶段时，隐藏关联计划
@@ -255,9 +255,9 @@
 37731 编辑执行时可以取消已关联的产品
 37730 项目的产品列表中可以取消已关联的产品
 37729 后台自定义的流程中，去掉组合方式之间的减号
-37675 无产品项目复制模块可以复制产品和无产品项目的模块
-37674 项目概况中展示产品型项目和无产品项目的标签
-37673 无产品项目研发需求隐藏移除按钮
+37675 项目型项目复制模块可以复制产品和项目型项目的模块
+37674 项目概况中展示产品型项目和项目型项目的标签
+37673 项目型项目研发需求隐藏移除按钮
 37660 创建产品页面所属项目集为空时，不显示产品线字段
 37658 产品调整所属项目集时，可以任意选择一个项目集
 37657 项目调整所属项目集时，可以任意选择一个项目集
@@ -268,44 +268,44 @@
 37612 新用户安装禅道18版本迅捷模式后关闭瀑布项目功能
 37603 从综合模式切到迅捷模式时，根据是否存在瀑布项目数据来判断是否开启瀑布项目功能
 37596 从综合模式切到迅捷模式时，访问权限是项目集内公开的项目统一调整为私有
-37572 无产品项目项目复制
-37553 无产品项目的权限通过项目维护
-37552 无产品项目的视野权限在产品中进行过滤，通过项目维护
-37551 无产品项目恢复时同步恢复影子产品
-37549 测试模块测试单功能展示产品和无产品项目的信息
-37546 测试模块用例功能统计产品和无产品项目的信息
-37544 测试模块bug功能统计产品和无产品项目的信息
+37572 项目型项目项目复制
+37553 项目型项目的权限通过项目维护
+37552 项目型项目的视野权限在产品中进行过滤，通过项目维护
+37551 项目型项目恢复时同步恢复影子产品
+37549 测试模块测试单功能展示产品和项目型项目的信息
+37546 测试模块用例功能统计产品和项目型项目的信息
+37544 测试模块bug功能统计产品和项目型项目的信息
 37542 实现从12版本升级到18版本综合模式的手工归并数据功能
-37541 无产品项目在测试区块仪表盘的所属产品展示为无产品项目名
+37541 项目型项目在测试区块仪表盘的所属产品展示为项目型项目名
 37540 地盘动态不展示影子产品的动态
-37539 无产品项目在地盘贡献的产品名称下展示为无产品项目名
-37538 无产品项目在地盘待处理的产品名称下展示为无产品项目名
-37537 无产品项目在地盘日志的所属产品展示为无产品项目名
-37534 无产品项目在地盘区块的产品名称下展示为无产品项目名
-37533 反馈不支持无产品项目
-37532 组织中无产品项目的所属产品展示为项目名
-37531 统计产品和测试菜单下的列表，无产品项目进行特殊处理
+37539 项目型项目在地盘贡献的产品名称下展示为项目型项目名
+37538 项目型项目在地盘待处理的产品名称下展示为项目型项目名
+37537 项目型项目在地盘日志的所属产品展示为项目型项目名
+37534 项目型项目在地盘区块的产品名称下展示为项目型项目名
+37533 反馈不支持项目型项目
+37532 组织中项目型项目的所属产品展示为项目名
+37531 统计产品和测试菜单下的列表，项目型项目进行特殊处理
 37530 资产库导入需求不展示无产品的产品名称
-37529 通用看板导入发布与导入计划的产品中增加无产品项目的层级，展示无产品项目名
+37529 通用看板导入发布与导入计划的产品中增加项目型项目的层级，展示项目型项目名
 37528 从12版本升级到18版本的综合模式时，增加自动或手工归并数据的功能
 37527 从12版本升级到18版本的迅捷模式时，增加自动或手工归并数据的功能
 37525 从综合模式切换为迅捷模式时可以选择一个项目集作为默认项目集
 37517 创建看板项目时可以设置是否启用迭代功能
 37504 迅捷模式下默认创建一个隐藏的项目集，关联所有产品和项目数据
-37462 无产品项目仪表盘隐藏所属产品字段
-37461 无产品项目执行的任务导入bug隐藏搜索的所属产品字段
-37460 无产品项目执行的日志导出数据隐藏所属产品
-37458 无产品项目中测试单功能隐藏产品信息
-37457 无产品项目中用例功能隐藏产品信息
-37456 无产品项目中bug功能隐藏产品信息
-37455 无产品项目中研发需求和用户需求列表导出和导入功能隐藏产品信息
-37454 无产品项目中研发需求和用户需求列表增加维护模块按钮
-37453 无产品项目中研发需求和用户需求列表隐藏所属产品信息
-37452 无产品项目执行的看板新建隐藏产品与计划
+37462 项目型项目仪表盘隐藏所属产品字段
+37461 项目型项目执行的任务导入bug隐藏搜索的所属产品字段
+37460 项目型项目执行的日志导出数据隐藏所属产品
+37458 项目型项目中测试单功能隐藏产品信息
+37457 项目型项目中用例功能隐藏产品信息
+37456 项目型项目中bug功能隐藏产品信息
+37455 项目型项目中研发需求和用户需求列表导出和导入功能隐藏产品信息
+37454 项目型项目中研发需求和用户需求列表增加维护模块按钮
+37453 项目型项目中研发需求和用户需求列表隐藏所属产品信息
+37452 项目型项目执行的看板新建隐藏产品与计划
 37451 看板项目的设置隐藏产品与计划字段
-37450 无产品项目中研发需求隐藏所属产品信息
-37449 无产品项目中增加用户需求模块
-37448 无产品项目中二级菜单研发需求改为需求，包含研发需求和用户需求
+37450 项目型项目中研发需求隐藏所属产品信息
+37449 项目型项目中增加用户需求模块
+37448 项目型项目中二级菜单研发需求改为需求，包含研发需求和用户需求
 37447 瀑布项目的报告隐藏产品
 37445 瀑布项目的估算的阶段隐藏产品
 37444 瀑布项目的评审隐藏产品
@@ -315,15 +315,15 @@
 37438 敏捷、瀑布项目的设置隐藏产品与计划字段
 37437 敏捷、瀑布、看板项目的版本隐藏产品字段
 37424 项目模块中执行的相关页面隐藏“所属产品”字段
-37422 项目列表页导出列表中增加“项目类型”，无产品项目的所属产品为“”
+37422 项目列表页导出列表中增加“项目类型”，项目型项目的所属产品为“”
 37421 项目列表搜索项增加“项目类型”
-37420 创建项目选择“项目类型”，可以创建产品型项目或无产品项目
+37420 创建项目选择“项目类型”，可以创建产品型项目或项目型项目
 37346 项目列表页增加字段“项目类型”
 37336 迅捷模式中隐藏产品线的相关功能
-37333 无产品项目的需求列表中增加批量创建功能
-37332 无产品项目的需求列表中取消关联研发需求功能
-37331 敏捷无产品项目中增加计划功能
-37328 无产品项目中发布隐藏产品信息
+37333 项目型项目的需求列表中增加批量创建功能
+37332 项目型项目的需求列表中取消关联研发需求功能
+37331 敏捷项目型项目中增加计划功能
+37328 项目型项目中发布隐藏产品信息
 37308 实现从15版本经典模式升级到18本版迅捷模式
 37292 实现从12版本升级到18版本迅捷模式的手工归并数据功能
 37291 12版本升级到18版本时，提供综合模式和迅捷模式的介绍和选择
@@ -334,9 +334,9 @@
 37272 从综合模式切换到迅捷模式时增加功能影响的提示信息
 37270 迅捷模式和综合模式的切换不做次数限制
 37268 调整后台自定义模式中的名称
-38176 无产品项目下可以设置与代码库的关联关系
-37635 在无产品项目下可以创建代码库
-37465 在无产品项目下可以提交评审问题
+38176 项目型项目下可以设置与代码库的关联关系
+37635 在项目型项目下可以创建代码库
+37465 在项目型项目下可以提交评审问题
 37464 代码库可以关联项目
 36616 实现版本升级后原存档讨论组逻辑处理
 36543 实现群主取消归档讨论组相关提醒及操作
@@ -362,11 +362,11 @@
 29702 批量编辑产品，自定义表单项显示产品线
 29650 新建项目时，关联产品下拉列表显示了非所选项目集下的产品
 29628 Bug默认指派人没指派给产品测试负责人
-29549 无产品项目和无产品迭代文档下搜索条件“所属产品”未隐藏掉
+29549 项目型项目和无产品迭代文档下搜索条件“所属产品”未隐藏掉
 29535 执行中转入任务后F12有报错信息
 29508 地盘--待处理中Bug列表错乱
 29499 项目概况页面所属项目集代码报错
-29452 无产品项目下批量编辑和批量指派给下拉数据与单个指派下拉数据范围不一致
+29452 项目型项目下批量编辑和批量指派给下拉数据与单个指派下拉数据范围不一致
 27994 禅道系统使用时切换页面会突然登录超时退出
 28255 无产品权限人员编辑代码库显示项目不正确
 27516 可合并讨论组的列表中列出了已经被合并的群
@@ -4783,7 +4783,7 @@
 1734 权限--按模块分配权限，提示文案里，control 能否改为 Ctrl。shift 改为 Shift。
 1733 用户列表页，点击用户真实姓名，跳转的页面，测试--负责的版本。表头字段没显示完整，没加title。样式也要调整一下，排序按钮太靠边框。
 1731 动态--搜索，对象类型里的 build 能否改为中文。
-1729 权限--视图维护，产品和项目不显示填写框。（无产品项目）
+1729 权限--视图维护，产品和项目不显示填写框。（项目型项目）
 1727 部门折叠展开按钮的显示位置要调整。
 1724 统计，测试，Bug创建表，选择产品和项目时，刷新选择框，显示的样式不对。
 1722 项目起止时间选择框，宽度不一致。前面窄后面的宽。
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 5e03904eb2..45a270c7ea 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -193,7 +193,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
-$lang->misc->feature->all['18.0.beta1'][] = array('title' => '主要对禅道多项核心流程进行改进，新增无产品项目、无迭代项目；支持项目跨项目集关联产品；支持轻量管理模式和全生命周期管理模式进行切换。', 'desc' => '');
+$lang->misc->feature->all['18.0.beta1'][] = array('title' => '主要对禅道多项核心流程进行改进，新增项目型项目、无迭代项目；支持项目跨项目集关联产品；支持轻量管理模式和全生命周期管理模式进行切换。', 'desc' => '');
 $lang->misc->feature->all['17.8'][]       = array('title' => '列表状态颜色、仪表盘颜色的改版和任务日志页面的优化。', 'desc' => '');
 $lang->misc->feature->all['17.7'][]       = array('title' => '过渡版本表格优化完成。新增工单功能，优化了反馈功能。修复Bug。', 'desc' => '');
 $lang->misc->feature->all['17.6.2'][]     = array('title' => '禅道更新叶兰绿、禅道蓝、青春蓝三大主题。实现附件批量上传功能。修复Bug。', 'desc' => '');
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 281c86d8e5..22610b3ac8 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -183,7 +183,7 @@ $lang->project->kanban             = '看板';
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
 $lang->project->projectTypeList[1] = '产品型项目';
-$lang->project->projectTypeList[0] = '无产品项目';
+$lang->project->projectTypeList[0] = '项目型项目';
 
 /* Project Kanban. */
 $lang->project->typeList = array();