From f40589033b5535733c64111474d7a019c4b34489 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Thu, 16 Mar 2023 09:24:09 +0800
Subject: [PATCH 01/49] * rename variables, avoiding duplicate variable names.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 399e35d52f..4db7860f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -102,10 +102,10 @@ zentaoxx:
 	mkdir zentaoxx/db/
 	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
 	rm -rf zentaoxx/db_bak/
-	sed -i "s/\$$accountAdmin = \$$this->dao->select('account, admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();/\$$accountAdmin = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();\n\$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$adminArray = explode(',', \$$admins);\n\$$accountAdmin->admin = in_array(\$$accountAdmin->account, \$$adminArray) ? 'super' : '';\n/" zentaoxx/extension/xuan/im/model/chat.php
+	sed -i "s/\$$accountAdmin = \$$this->dao->select('account, admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();/\$$accountAdmin = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();\n\$$sysAdmins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$sysAdminArray = explode(',', \$$sysAdmins);\n\$$accountAdmin->admin = in_array(\$$accountAdmin->account, \$$sysAdminArray) ? 'super' : '';\n/" zentaoxx/extension/xuan/im/model/chat.php
 	sed -i "s/\$$sysAdmins = \$$this->dao->select('id')->from(TABLE_USER)->where('admin')->eq('super')->fetchPairs();/\$$account = \$$this->loadModel('user')->getById(\$$userID);\n\$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$adminArray = explode(',', \$$admins);\nreturn in_array(\$$account, \$$adminArray);\n/" zentaoxx/extension/xuan/im/model/chat.php
 	sed -i "/->on('tc.ownedBy=tu.account')/{ N ; s/type/tc.type/}" zentaoxx/extension/xuan/im/model/chat.php
-	sed -i "s/\$$super = \$$this->dao->select('admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('admin');/\$$account = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('account');\n\$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$adminArray = explode(',', \$$admins);\n\$$super = in_array(\$$account, \$$adminArray) ? 'super' : '';/g" zentaoxx/extension/xuan/im/control.php
+	sed -i "s/\$$super = \$$this->dao->select('admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('admin');/\$$account = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('account');\n\$$sysAdmins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$sysAdminArray = explode(',', \$$sysAdmins);\n\$$super = in_array(\$$account, \$$sysAdminArray) ? 'super' : '';/g" zentaoxx/extension/xuan/im/control.php
 	sed -i "/foreach(\$$users as \$$user)/i \$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\$$adminArray = explode(',', \$$admins);" zentaoxx/extension/xuan/im/model/user.php
 	sed -i "/if(\!isset(\$$user->signed)) \$$user->signed  = 0;/a \$$user->admin = in_array(\$$user->account, \$$adminArray) ? 'super' : '';" zentaoxx/extension/xuan/im/model/user.php
 	sed -i "/updateUser->ping/d" zentaoxx/extension/xuan/im/model/user.php

From 1b7aaf7e6bd4118827f991c0f4138ce56b8022ef Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 10:03:36 +0800
Subject: [PATCH 02/49] * Code for Bug #32987.

---
 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 fed1d8bf72..e7698cfb49 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1631,7 +1631,7 @@ class story extends control
                 {
                     $module = 'story';
                     $method = 'view';
-                    $params = "storyID=$storyID&version=0&param=0&storyType=$storyType";
+                    $params = "storyID=$storyID&version=0&param={$this->session->execution}&storyType=$storyType";
                 }
             }
             else

From 4bcac4593aaed5a2fb7761d67d31b4f317695623 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 10:05:37 +0800
Subject: [PATCH 03/49]  * fix bug #32988.

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

diff --git a/framework/router.class.php b/framework/router.class.php
index 289e477a8c..52d68f48d1 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -109,7 +109,7 @@ class router extends baseRouter
         parent::loadLang($moduleName, $appName);
 
         /* Replace main nav lang. */
-        if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name))
+        if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name) and !defined('IN_UPGRADE'))
         {
             $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}'")->fetchAll();
             foreach($customMenus as $menu)

From 103ef2810c839feffd580499a9ace12816382aac Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 10:10:31 +0800
Subject: [PATCH 04/49]  * fix bug #32990.

---
 module/dev/lang/de.php | 2 +-
 module/dev/lang/en.php | 2 +-
 module/dev/lang/fr.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index e815c1b72d..2d3d7cc520 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -18,7 +18,7 @@ $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
 $lang->dev->paramMailto    = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, Please turn on.";
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index ac7deabf7e..fc609d9902 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -18,7 +18,7 @@ $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
 $lang->dev->paramMailto    = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, Please turn on.";
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index ac7deabf7e..fc609d9902 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -18,7 +18,7 @@ $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
 $lang->dev->paramMailto    = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, Please turn on.";
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 

From a2103757c3cd1c4ecb16baaa876528a1b1b24763 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 10:15:12 +0800
Subject: [PATCH 05/49] * Code for Bug #32974.

---
 www/js/my.full.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 8dc500a846..baa0e57a5a 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -993,7 +993,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     $parentTd = $form.find('td.has-child');
     if($parentTd.length == 0) return false;
 
-    var toggleClass = ['product', 'requirement'].includes(objectType) ? 'story-toggle' : 'task-toggle';
+    var toggleClass = ['product', 'requirement', 'story'].indexOf(objectType) !== -1 ? 'story-toggle' : 'task-toggle';
     var nameClass   = ['product', 'productplan'].indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
     $form.find('th.' + nameClass).addClass('clearfix').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");
 

From 068784e472ba1ab0710f57b7294fa58f585397ba Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 02:17:48 +0000
Subject: [PATCH 06/49] * Fix bug #32954.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 3c3ee37b8d..9218e4c1a9 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5684,12 +5684,13 @@ class executionModel extends model
      */
     public function generateRow($executions, $users, $productID)
     {
-        $rows = array();
+        $today = helper::today();
+        $rows  = array();
         foreach($executions as $id => $execution)
         {
             $label = $execution->type == 'stage' ? 'label-warning' : 'label-info';
             $link  = $execution->type == 'kanban' ? helper::createLink('execution', 'kanban', "id=$execution->id") : helper::createLink('execution', 'task', "id=$execution->id");
-            $execution->name     = "<span class='project-type-label label label-outline $label'>{$this->lang->execution->typeList[$execution->type]}</span> " . (empty($execution->children) ? html::a($link, $execution->name) : $execution->name);
+            $execution->name     = "<span class='project-type-label label label-outline $label'>{$this->lang->execution->typeList[$execution->type]}</span> " . (empty($execution->children) ? html::a($link, $execution->name) : $execution->name) . (strtotime($today) > strtotime($execution->end) ? '<span class="label label-danger label-badge">' . $this->lang->execution->delayed . '</span>' : '');;
             $execution->project  = $execution->projectName;
             $execution->parent   = ($execution->parent and $execution->grade > 1) ? $execution->parent : '';
             $execution->asParent = !empty($execution->children);

From 8c8b846ed4dbac8ecdcafc6c8781c2409300f61d Mon Sep 17 00:00:00 2001
From: zhaoke <yuaiwuhen@hotmail.com>
Date: Thu, 16 Mar 2023 10:18:30 +0800
Subject: [PATCH 07/49] * modify the getImageList method in the zahost model,
 fix bug #32867.

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

diff --git a/module/zahost/model.php b/module/zahost/model.php
index 8244095ee8..3aa0029f42 100644
--- a/module/zahost/model.php
+++ b/module/zahost/model.php
@@ -193,7 +193,7 @@ class zahostModel extends model
      */
     public function getImageList($hostID, $browseType = 'all', $param = 0, $orderBy = 'id', $pager = null)
     {
-        $imageList    = json_decode(file_get_contents($this->config->zahost->imageListUrl));
+        $imageList    = json_decode(commonModel::http($this->config->zahost->imageListUrl, array(), array()));
 
         $downloadedImageList = $this->dao->select('*')->from(TABLE_IMAGE)
             ->where('host')->eq($hostID)
@@ -256,7 +256,7 @@ class zahostModel extends model
      */
     public function createImage($hostID, $imageName)
     {
-        $imageList = json_decode(file_get_contents($this->config->zahost->imageListUrl));
+        $imageList = json_decode(commonModel::http($this->config->zahost->imageListUrl, array(), array()));
 
         $imageData = new stdclass;
         foreach($imageList  as $item) if($item->name == $imageName) $imageData = $item;

From 6c9f1435a0b779c89ec475872350fd5d178ceca5 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 02:32:00 +0000
Subject: [PATCH 08/49] * Fix bug #32992.

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

diff --git a/module/execution/css/view.css b/module/execution/css/view.css
index ade5431e42..5be4918dab 100644
--- a/module/execution/css/view.css
+++ b/module/execution/css/view.css
@@ -27,5 +27,5 @@
 
 #cfdChart {margin-top: -20px;}
 
-#triggerModal .modal-dialog {top: 15% !important; overflow-y: auto; max-height: 80%;}
+#triggerModal .modal-dialog {top: 15% !important; max-height: 80%;}
 #triggerModal .modal-dialog::-webkit-scrollbar-track {background-color: white;}

From 3348925050399808ece5e990de41343f0dfac85f Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 10:35:14 +0800
Subject: [PATCH 09/49]  * fix bug #32176.

---
 module/tree/control.php              | 3 ++-
 module/tree/lang/de.php              | 6 ++++--
 module/tree/lang/en.php              | 2 ++
 module/tree/lang/fr.php              | 6 ++++--
 module/tree/lang/zh-cn.php           | 2 ++
 module/tree/view/browsetask.html.php | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index fb5b87e70b..6f8c9dd2af 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -355,7 +355,7 @@ class tree extends control
         $parentModules = $this->tree->getParents($currentModuleID);
         $newModule     = (version_compare($execution->openedVersion, '4.1', '>') and $products) ? true : false;
 
-        $title      = $this->lang->tree->manageExecution;
+        $title      = $execution->multiple ? $this->lang->tree->manageExecution : $this->lang->tree->manageProject;
         $position[] = html::a($this->createLink('execution', 'task', "executionID=$rootID"), $execution->name);
         $position[] = $this->lang->tree->manageExecution;
 
@@ -363,6 +363,7 @@ class tree extends control
         $this->view->position        = $position;
         $this->view->rootID          = $rootID;
         $this->view->productID       = $productID;
+        $this->view->execution       = $execution;
         $this->view->allProject      = $executions;
         $this->view->newModule       = $newModule;
         $this->view->modules         = $this->tree->getTaskTreeMenu($rootID, $productID, $rooteModuleID = 0, array('treeModel', 'createTaskManageLink'), 'allModule');
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
index 1d73326eb3..21e0e0ab65 100755
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -18,7 +18,8 @@ $lang->tree->browseTask           = 'Aufgaben Modul verwalten';
 $lang->tree->manage               = 'Modul verwalten';
 $lang->tree->fix                  = 'Fix';
 $lang->tree->manageProduct        = "Verwalte {$lang->productCommon}";
-$lang->tree->manageExecution      = "Verwalte {$lang->executionCommon}";
+$lang->tree->manageProject        = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageExecution      = "Verwalte {$lang->execution->common}";
 $lang->tree->manageLine           = "Manage Product Line";
 $lang->tree->manageBug            = 'Verwalte Bugs';
 $lang->tree->manageCase           = 'Verwalte Fälle';
@@ -34,7 +35,8 @@ $lang->tree->manageCaseChild      = 'Verwalte Fälle';
 $lang->tree->manageCaselibChild   = 'Verwalte Bibliothek';
 $lang->tree->manageDashboard      = 'Manage Dashboard Module';
 $lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
-$lang->tree->manageTaskChild      = "Verwalte {$lang->executionCommon}";
+$lang->tree->manageProjectChild   = "Verwalte {$lang->projectCommon}";
+$lang->tree->manageTaskChild      = "Verwalte {$lang->execution->common}";
 $lang->tree->syncFromProduct      = "Copy from Other {$lang->productCommon}s";
 $lang->tree->dragAndSort          = "Ziehen und Sotieren";
 $lang->tree->sort                 = "Sortieren";
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index 8dda2ca8e9..578bc00667 100755
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -18,6 +18,7 @@ $lang->tree->browseTask           = 'Manage Task Module';
 $lang->tree->manage               = 'Manage Module';
 $lang->tree->fix                  = 'Fix Module';
 $lang->tree->manageProduct        = "Manage {$lang->productCommon} Modules";
+$lang->tree->manageProject        = "Manage {$lang->projectCommon} Modules";
 $lang->tree->manageExecution      = "Manage {$lang->execution->common} Modules";
 $lang->tree->manageLine           = "Manage Product Line";
 $lang->tree->manageBug            = 'Manage Bug';
@@ -34,6 +35,7 @@ $lang->tree->manageCaseChild      = 'Manage Child Cases';
 $lang->tree->manageCaselibChild   = 'Manage Child Libraries';
 $lang->tree->manageDashboard      = 'Manage Dashboard Module';
 $lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
+$lang->tree->manageProjectChild   = "Manage Child {$lang->projectCommon} Modules";
 $lang->tree->manageTaskChild      = "Manage Child {$lang->execution->common} Modules";
 $lang->tree->syncFromProduct      = "Copy from Other {$lang->productCommon}s";
 $lang->tree->dragAndSort          = "Drag to order";
diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php
index 5156cd0beb..02ecf93415 100755
--- a/module/tree/lang/fr.php
+++ b/module/tree/lang/fr.php
@@ -18,7 +18,8 @@ $lang->tree->browseTask           = 'Gérer les Modules Tâche';
 $lang->tree->manage               = 'Gérer les Modules';
 $lang->tree->fix                  = 'Corrigez Module';
 $lang->tree->manageProduct        = "Gérer les Modules {$lang->productCommon}";
-$lang->tree->manageExecution      = "Gérer les Modules {$lang->executionCommon}";
+$lang->tree->manageProject        = "Gérer les Modules {$lang->projectCommon}";
+$lang->tree->manageExecution      = "Gérer les Modules {$lang->execution->common}";
 $lang->tree->manageLine           = 'Gérer Ligne Produit';
 $lang->tree->manageBug            = 'Gérer Bugs';
 $lang->tree->manageCase           = 'Gérer CasTests';
@@ -34,7 +35,8 @@ $lang->tree->manageCaseChild      = 'Gérer Sous-CasTests';
 $lang->tree->manageCaselibChild   = 'Gérer Sous-Librairies';
 $lang->tree->manageDashboard      = 'Manage Dashboard Module';
 $lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
-$lang->tree->manageTaskChild      = "Gérer Sous-Modules {$lang->executionCommon}";
+$lang->tree->manageProjectChild   = "Gérer Sous-Modules {$lang->projectCommon}";
+$lang->tree->manageTaskChild      = "Gérer Sous-Modules {$lang->execution->common}";
 $lang->tree->syncFromProduct      = "Copier d'un autre {$lang->productCommon}";
 $lang->tree->dragAndSort          = "Faites glisser pour ordonner";
 $lang->tree->sort                 = "Ordonnez";
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 44be3bab66..78d8ac05e1 100755
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -18,6 +18,7 @@ $lang->tree->browseTask           = '任务模块维护';
 $lang->tree->manage               = '维护模块';
 $lang->tree->fix                  = '修正数据';
 $lang->tree->manageProduct        = "维护{$lang->productCommon}视图模块";
+$lang->tree->manageProject        = "维护{$lang->projectCommon}视图模块";
 $lang->tree->manageExecution      = "维护{$lang->execution->common}视图模块";
 $lang->tree->manageLine           = "维护产品线";
 $lang->tree->manageBug            = '维护测试视图模块';
@@ -34,6 +35,7 @@ $lang->tree->manageCaseChild      = '维护用例子模块';
 $lang->tree->manageCaselibChild   = '维护用例库子模块';
 $lang->tree->manageDashboard      = '维护仪表盘模块';
 $lang->tree->manageDashboardChild = '维护仪表盘子模块';
+$lang->tree->manageProjectChild   = "维护{$lang->projectCommon}子模块";
 $lang->tree->manageTaskChild      = "维护{$lang->execution->common}子模块";
 $lang->tree->syncFromProduct      = '复制模块';
 $lang->tree->dragAndSort          = "拖放排序";
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 2f063c92c6..44896926aa 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -44,7 +44,7 @@ li.story-item > .tree-actions .tree-action[data-type=delete] {display: none;}
     <form id='childrenForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=task");?>'>
       <div class='panel'>
         <div class='panel-heading'>
-          <div class='panel-title'><?php echo $lang->tree->manageTaskChild;?></div>
+          <div class='panel-title'><?php echo $execution->multiple ? $lang->tree->manageTaskChild : $lang->tree->manageProjectChild;?></div>
         </div>
         <div class='panel-body'>
           <table class='table table-form table-auto'>

From 7e78d0e54a6926f53d62cf6987618d85767079d0 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 10:40:58 +0800
Subject: [PATCH 10/49]  * fix bug #32156.

---
 module/execution/lang/zh-cn.php      | 4 ++--
 module/execution/view/story.html.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index b5fc440213..276bcda25b 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -654,8 +654,8 @@ $lang->execution->gantt->exportFail = '导出失败。';
 
 $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
 
-$lang->execution->linkBranchStoryByPlanTips = "执行按计划关联需求时，只导入本执行所关联%s的激活状态的需求。";
-$lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时，只导入激活状态的需求。";
+$lang->execution->linkBranchStoryByPlanTips = "{$lang->execution->common}按计划关联需求时，只导入本{$lang->execution->common}所关联%s的激活状态的需求。";
+$lang->execution->linkNormalStoryByPlanTips = "{$lang->execution->common}按计划关联需求时，只导入激活状态的需求。";
 
 $lang->execution->featureBar['dynamic']['all']       = '全部';
 $lang->execution->featureBar['dynamic']['today']     = '今天';
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 54cc115c73..c0deffdee0 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -404,7 +404,7 @@
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
         <?php
         $linkStoryByPlanTips = $multiBranch ? sprintf($lang->execution->linkBranchStoryByPlanTips, $lang->project->branch) : $lang->execution->linkNormalStoryByPlanTips;
-        $linkStoryByPlanTips = $execution->multiple ? $linkStoryByPlanTips : str_replace($lang->executionCommon, $lang->projectCommon, $linkStoryByPlanTips);
+        $linkStoryByPlanTips = $execution->multiple ? $linkStoryByPlanTips : str_replace($lang->execution->common, $lang->projectCommon, $linkStoryByPlanTips);
         ?>
         <h4 class="modal-title"><?php echo $lang->execution->linkStoryByPlan;?></h4><?php echo '(' . $linkStoryByPlanTips . ')';?>
       </div>

From 01a2c74a7f3a4ed8726f3b7386571063e7087b2e Mon Sep 17 00:00:00 2001
From: zhaoke <yuaiwuhen@hotmail.com>
Date: Thu, 16 Mar 2023 10:43:14 +0800
Subject: [PATCH 11/49] * Remove snapshot when create failed.

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

diff --git a/api/v1/entries/hostsubmit.php b/api/v1/entries/hostsubmit.php
index 9aea53faf2..157d329ac1 100644
--- a/api/v1/entries/hostsubmit.php
+++ b/api/v1/entries/hostsubmit.php
@@ -48,7 +48,7 @@ class hostSubmitEntry extends baseEntry
         {
             if(in_array($image->status, array('failed', 'completed'))) $image->status = $image->status == 'completed' ? 'restore_completed' : 'restore_failed';
         }
-        else if($imageInfo->from == 'snapshot' && $imageInfo->status == 'creating')
+        else if($imageInfo->from == 'snapshot')
         {
             if($image->status == 'failed')
             {

From b283c3089562c55b46044f5dd976681a926fe3e2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 02:47:20 +0000
Subject: [PATCH 12/49] * Fix bug #32995.

---
 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 fed1d8bf72..917a8e9f7c 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1283,7 +1283,7 @@ class story extends control
                 $method = 'view';
                 $params = "storyID=$storyID&version=0&param=0&storyType=$storyType";
             }
-            return print(js::locate($this->createLink($module, $method, $params), 'parent'));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($module, $method, $params)));
         }
 
         $this->commonAction($storyID);

From 68bad00edcec4dd44719b2a9e7fd0622c8a39f32 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 11:11:26 +0800
Subject: [PATCH 13/49] * Code for fix bug #32989.

---
 module/story/control.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index e7698cfb49..e98a0e4ed9 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1267,9 +1267,14 @@ class story extends control
 
             if($this->app->tab == 'project')
             {
-                $module = 'projectstory';
-                $method = 'view';
-                $params = "storyID=$storyID";
+                $module  = 'projectstory';
+                $method  = 'view';
+                $params  = "storyID=$storyID";
+                if(!$this->session->multiple)
+                {
+                    $module  = 'story';
+                    $params .= "&version=0&param={$this->session->project}&storyType=$storyType";
+                }
             }
             elseif($this->app->tab == 'execution')
             {
@@ -1283,7 +1288,8 @@ class story extends control
                 $method = 'view';
                 $params = "storyID=$storyID&version=0&param=0&storyType=$storyType";
             }
-            return print(js::locate($this->createLink($module, $method, $params), 'parent'));
+
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($module, $method, $params)));
         }
 
         $this->commonAction($storyID);
@@ -1800,9 +1806,6 @@ class story extends control
         $story   = $this->story->getById($storyID);
         $product = $this->product->getById($story->product);
 
-        /* Set menu. */
-        $this->product->setMenu($story->product, $story->branch);
-
         /* Get reviewers. */
         $reviewers = $product->reviewer;
         if(!$reviewers and $product->acl != 'open') $reviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');

From 813021747b530e6c1e164517c0406eea33884df9 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 11:19:36 +0800
Subject: [PATCH 14/49] * Code for bug #32997, 32999.

---
 module/common/view/kindeditor.html.php |  4 ++++
 www/js/my.full.js                      | 23 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php
index 74626a21db..5da89fc62c 100755
--- a/module/common/view/kindeditor.html.php
+++ b/module/common/view/kindeditor.html.php
@@ -109,6 +109,10 @@ $uid = uniqid('');
             items: editorTool,
             placeholder: $editor.attr('placeholder') || options.placeholder || '',
             pasteImage: {postUrl: createLink('file', 'ajaxPasteImg', 'uid=' + kuid), placeholder: $editor.attr('placeholder') || <?php echo json_encode($lang->noticePasteImg);?>},
+            afterChange: function()
+            {
+                $editor.closest('.main-form').trigger('change');
+            }
         });
 
         try
diff --git a/www/js/my.full.js b/www/js/my.full.js
index baa0e57a5a..eafb7a7b15 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -26,7 +26,7 @@
         var skipModules = ['repo', 'mr', 'job'];
         if(skipModules.indexOf(config.currentModule) !== -1) return;
 
-        var skipMethods = ['edit', 'import', 'login', 'export', 'finish', 'confirm', 'resolve', 'start', 'pause', 'cancel', 'report', 'close', 'activate', 'restart', 'suspend', 'putoff', 'browse', 'hangup', 'track', 'index', 'reply', 'manage', 'run'];
+        var skipMethods = ['edit', 'import', 'login', 'export', 'finish', 'confirm', 'resolve', 'start', 'pause', 'cancel', 'report', 'close', 'activate', 'restart', 'suspend', 'putoff', 'browse', 'hangup', 'track', 'index', 'reply', 'manage', 'run', 'show'];
         for(var i = 0; i < skipMethods.length; i++)
         {
             if(config.currentMethod.indexOf(skipMethods[i]) === 0) return;
@@ -39,13 +39,25 @@
             {
                 if($(form).hasClass('no-stash') || $(form).data('ride') == 'table') return;
                 var target = $(form).attr('target');
-                if($(form).attr('target') == 'hiddenwin' && config.currentModule.indexOf('program') == -1 && config.currentModule.indexOf('project') == -1 && config.currentModule.indexOf('testcase') == -1) return;
+                if($(form).attr('target') == 'hiddenwin')
+                {
+                    var needSkip    = true;
+                    var keepModules = ['program', 'product', 'project', 'testcase'];
+                    for(var i = 0; i < keepModules.length; i++)
+                    {
+                        if(needSkip && config.currentModule.indexOf(keepModules[i]) === 0) needSkip = false;
+                    };
+
+                    if(needSkip) return;
+                }
 
                 var formID         = config.currentMethod + '-' + config.currentModule + '-' + $(form).attr("id");
                 var formDataStored = $.zui.store.get(formID);
+                /* Clear form data for store. */
                 setTimeout(function() {
                     $.zui.store.remove(formID);
-                }, 100)
+                }, 100);
+
                 if(formDataStored && formDataStored.length)
                 {
                     var message = lang.confirmDraft.replace('%name%', lang[config.currentModule] ? lang[config.currentModule] : '');
@@ -113,10 +125,7 @@
                                         {
                                             KindEditor.remove('#' + item.name);
                                             formItem.val(item.value);
-                                            $(formItem).kindeditor({
-                                                /* Conetnt change event. */
-                                                afterChange: storeFormData(formID, $(form).serializeArray())
-                                            });
+                                            $(formItem).kindeditor();
                                         }
                                         else
                                         {

From 068b071db848f123b15814f75a23e2af651a8d6a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 11:29:36 +0800
Subject: [PATCH 15/49] * Code for Bug #32994.

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

diff --git a/module/admin/model.php b/module/admin/model.php
index 7253ab5c88..81209b5347 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -666,6 +666,7 @@ class adminModel extends model
             ->limit('1')
             ->fetch('date');
 
+        if($firstUseDate) $firstUseDate = substr($firstUseDate, 0, 10);
         return helper::getDateInterval($firstUseDate);
     }
 

From 34de9a5fe4eb4be9122aacf29f642a2f81e1ee3d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 05:10:56 +0000
Subject: [PATCH 16/49] * Fix bug #32958.

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

diff --git a/module/tree/model.php b/module/tree/model.php
index 436ee6b15c..a365ecd635 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -998,6 +998,7 @@ class treeModel extends model
 
         if($linkObject)
         {
+            $branch = zget($extra, 'branchID', 0);
             /* Get object paths of this execution. */
             if(strpos(',story,case,', ",$linkObject,") !== false)
             {
@@ -1009,7 +1010,7 @@ class treeModel extends model
                     ->orWhere('t4.project')->eq($executionID)->markRight(1)
                     ->andWhere('t3.deleted')->eq(0)
                     ->andWhere('t2.deleted')->eq(0)
-                    ->beginIF(isset($extra['branchID']))->andWhere('t2.branch')->eq(zget($extra, 'branchID', 0))->fi()
+                    ->beginIF(isset($extra['branchID']) and $branchID !== 'all')->andWhere('t2.branch')->eq($branch)->fi()
                     ->fetchPairs();
             }
             elseif($linkObject == 'bug' and strpos(',project,execution,', ",{$this->app->tab},") !== false)
@@ -1018,7 +1019,7 @@ class treeModel extends model
                     ->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module = t2.id')
                     ->where('t1.deleted')->eq(0)
                     ->andWhere('t2.deleted')->eq(0)
-                    ->andWhere('t1.branch')->eq(zget($extra, 'branchID', 0))
+                    ->beginIF(isset($extra['branchID']) and $branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
                     ->andWhere("t1.{$this->app->tab}")->eq($executionID)
                     ->fetchPairs();
             }

From 94d4b5419be170c56466fa547b56c25451efea48 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 05:16:26 +0000
Subject: [PATCH 17/49] * Fix bug #32958.

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

diff --git a/module/tree/model.php b/module/tree/model.php
index a365ecd635..23662f0bf8 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1010,7 +1010,7 @@ class treeModel extends model
                     ->orWhere('t4.project')->eq($executionID)->markRight(1)
                     ->andWhere('t3.deleted')->eq(0)
                     ->andWhere('t2.deleted')->eq(0)
-                    ->beginIF(isset($extra['branchID']) and $branchID !== 'all')->andWhere('t2.branch')->eq($branch)->fi()
+                    ->beginIF(isset($extra['branchID']) and $branch !== 'all')->andWhere('t2.branch')->eq($branch)->fi()
                     ->fetchPairs();
             }
             elseif($linkObject == 'bug' and strpos(',project,execution,', ",{$this->app->tab},") !== false)

From a168008406a31adc1a73be1f0701ec963c6dcbbe Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 05:29:54 +0000
Subject: [PATCH 18/49] * Fix bug #33001.

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

diff --git a/module/action/model.php b/module/action/model.php
index d0133ef7fd..8dc16c0131 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -453,7 +453,7 @@ class actionModel extends model
             elseif($actionName == 'unlinkedfromexecution')
             {
                 $name = $this->dao->select('name')->from(TABLE_PROJECT)->where('id')->eq($action->extra)->fetch('name');
-                if($name) $action->extra = common::hasPriv('project', 'story') ? html::a(helper::createLink('project', 'story', "projectID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name;
+                if($name) $action->extra = common::hasPriv('execution', 'view') ? html::a(helper::createLink('execution', 'view', "executionID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name;
             }
             elseif($actionName == 'unlinkedfromproject')
             {
@@ -949,7 +949,7 @@ class actionModel extends model
             else
             {
                 if($actionType == 'restoredsnapshot' && in_array($action->objectType, array('vm', 'zanode')) && $value == 'defaultSnap') $value = $this->lang->$objectType->snapshot->defaultSnapName;
-                
+
                 $desc = str_replace('$' . $key, $value, $desc);
             }
         }

From 8949e97078353c6addba304c694652b66279fcf2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 13:42:01 +0800
Subject: [PATCH 19/49] * Modify story page collapsed.

---
 module/story/model.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index ecefa374c6..1395cd9c2a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5167,12 +5167,13 @@ class storyModel extends model
                 {
                     $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
                 }
-                if($storyType == 'requirement' and $story->type == 'story') echo '<span class="label label-badge label-light">SR</span> ';
-                if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}";
-                if(isset($branches[$story->branch]) and $showBranch and $this->config->vision == 'rnd') echo "<span class='label label-outline label-badge' title={$branches[$story->branch]}>{$branches[$story->branch]}</span> ";
-                if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
-                if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
-                echo $canView ? html::a($storyLink, $story->title, '', "title='$story->title' style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";
+                $titleHtml = $story->title;
+                if($storyType == 'requirement' and $story->type == 'story') $titleHtml = '<span class="label label-badge label-light">SR</span> ';
+                if($story->parent > 0 and isset($story->parentName)) $titleHtml = "{$story->parentName} / ";
+                if(isset($branches[$story->branch]) and $showBranch and $this->config->vision == 'rnd') $titleHtml = "<span class='label label-outline label-badge' title={$branches[$story->branch]}>{$branches[$story->branch]}</span> ";
+                if($story->module and isset($modulePairs[$story->module])) $titleHtml = "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
+                if($story->parent > 0) $titleHtml = '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
+                echo $canView ? html::a($storyLink, $titleHtml . $story->title, '', "title='$story->title' style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$titleHtml}{$story->title}</span>";
                 if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';
                 break;
             case 'plan':

From 1ae540dbe780deed6af7d123f06f958794507433 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 05:49:21 +0000
Subject: [PATCH 20/49] * Fix bug #33003.

---
 module/user/control.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index 4870995750..dbc1c72280 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -124,7 +124,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Modify story title. */
         $this->loadModel('story');
@@ -167,7 +168,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Set the menu. */
         $this->view->userList = $this->user->setUserList($users, $userID);
@@ -208,7 +210,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Set menu. */
         $this->view->userList = $this->user->setUserList($users, $userID);
@@ -248,7 +251,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Set menu. */
         $this->view->userList = $this->user->setUserList($users, $userID);
@@ -299,7 +303,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Append id for secend sort. */
         $sort = common::appendOrder($orderBy);
@@ -355,7 +360,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -395,7 +401,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -435,7 +442,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -468,7 +476,8 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         $this->view->title        = "USER #$user->id $user->account/" . $this->lang->user->profile;
         $this->view->position[]   = $this->lang->user->common;
@@ -1204,7 +1213,8 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
-        $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
+        $deptID  = $this->app->user->admin ? 0 : $this->app->user->dept;
+        $users   = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id');
 
         /* set menus. */
         $this->view->userList = $this->user->setUserList($users, $userID);

From 1fbb0b4c5fa4beac2eb285f29667484d8f9e34cf Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 14:06:55 +0800
Subject: [PATCH 21/49]  * fix for upgrade.

---
 framework/router.class.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index 52d68f48d1..11d4224ba6 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -109,9 +109,15 @@ class router extends baseRouter
         parent::loadLang($moduleName, $appName);
 
         /* Replace main nav lang. */
-        if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name) and !defined('IN_UPGRADE'))
+        if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name))
         {
-            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}'")->fetchAll();
+            $customMenus = array();
+            try
+            {
+                $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}'")->fetchAll();
+            }
+            catch(PDOException $exception){}
+
             foreach($customMenus as $menu)
             {
                 $menuKey = $menu->key;
@@ -317,7 +323,12 @@ class router extends baseRouter
             }
 
             /* Replace common lang. */
-            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}'")->fetchAll();
+            $customMenus = array();
+            try
+            {
+                $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}'")->fetchAll();
+            }
+            catch(PDOException $exception){}
             foreach($customMenus as $menu) if(isset($lang->{$menu->key})) $lang->{$menu->key} = $menu->value;
         }
     }

From d435783cae860e1b83f666cc45941ce280046b57 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:09:01 +0800
Subject: [PATCH 22/49] * Modify font color.

---
 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 3c3ee37b8d..842b504e8c 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5689,7 +5689,7 @@ class executionModel extends model
         {
             $label = $execution->type == 'stage' ? 'label-warning' : 'label-info';
             $link  = $execution->type == 'kanban' ? helper::createLink('execution', 'kanban', "id=$execution->id") : helper::createLink('execution', 'task', "id=$execution->id");
-            $execution->name     = "<span class='project-type-label label label-outline $label'>{$this->lang->execution->typeList[$execution->type]}</span> " . (empty($execution->children) ? html::a($link, $execution->name) : $execution->name);
+            $execution->name     = "<span class='project-type-label label label-outline $label'>{$this->lang->execution->typeList[$execution->type]}</span> " . (empty($execution->children) ? html::a($link, $execution->name, '_self', 'class="text-primary"') : $execution->name);
             $execution->project  = $execution->projectName;
             $execution->parent   = ($execution->parent and $execution->grade > 1) ? $execution->parent : '';
             $execution->asParent = !empty($execution->children);

From 8e3935c8d75a380edf3e08306811a1a8093a4ce4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:11:11 +0800
Subject: [PATCH 23/49] * Modify font color.

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

diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php
index f583c20b12..8d08bf51c3 100644
--- a/module/block/view/scrumlistblock.html.php
+++ b/module/block/view/scrumlistblock.html.php
@@ -45,7 +45,7 @@
       $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
       ?>
       <tr <?php echo $appid?>>
-        <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name'");?></nobr></td>
+        <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name' class='text-primary'");?></nobr></td>
         <td class="c-date"><?php echo $execution->end;?></td>
         <?php if($longBlock):?>
         <td class="w-70px">

From 91022eeaa646aba2cae20f1dc9a19c1bfffaa134 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:16:26 +0800
Subject: [PATCH 24/49] * Adjust code .

---
 www/js/my.full.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index eafb7a7b15..d3c9273a1e 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -64,7 +64,7 @@
                     new $.zui.Messager(message, {
                         type: 'success',
                         close: true,
-                        placement: 'center',
+                        placement: 'top',
                         time: 0,
                         actions: [
                             {
@@ -82,11 +82,11 @@
                                         {
                                             if((item.name.indexOf(']') != -1) && (item.name.indexOf('[') != -1))
                                             {
-                                                var formItem = $('[name^=' + item.name.replace('[]', '').replace('[', '').replace(']', '') + ']');
+                                                var formItem = $('#' + item.name.replace('[]', '').replace('[', '').replace(']', ''));
                                             }
                                             else
                                             {
-                                                var formItem = $('[name^=' + item.name.replace('[]', '') + ']');
+                                                var formItem = $('#' + item.name.replace('[]', ''));
                                             }
                                         }
                                         else if((item.name.indexOf(']') != -1) && (item.name.indexOf('[') != -1))

From c7bd19144f0d7313a537a4bb8295a4393b5d69f7 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 06:27:23 +0000
Subject: [PATCH 25/49] * Fix bug #32991.

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

diff --git a/module/story/model.php b/module/story/model.php
index ecefa374c6..62b9f45c64 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1591,6 +1591,7 @@ class storyModel extends model
             ->setDefault('reviewedDate', $date)
             ->stripTags($this->config->story->editor->review['id'], $this->config->allowedTags)
             ->setIF(!$this->post->assignedTo, 'assignedTo', '')
+            ->setIF(!empty($_POST['assignedTo']), 'assignedDate', $now)
             ->removeIF($this->post->result != 'reject', 'closedReason, duplicateStory, childStories')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'duplicate', 'duplicateStory')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'subdivided', 'childStories')

From d0792c47f9f5bf3a4d344bad65f9fc00242a5b58 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:32:31 +0800
Subject: [PATCH 26/49] * Fix bug #33008.

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

diff --git a/module/productplan/control.php b/module/productplan/control.php
index cda8b66494..c91f6428ca 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -28,7 +28,7 @@ class productplan extends control
         $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
 
         $this->app->loadConfig('execution');
-        $this->product->setMenu($productID, $branch);
+        if(!$product->shadow) $this->product->setMenu($productID, $branch);
         $this->session->set('currentProductType', $product->type);
 
         $branches = $this->loadModel('branch')->getList($productID, 0, 'all');

From 8556ab4f3102a7f6748f1a990716a347b03d5364 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:33:21 +0800
Subject: [PATCH 27/49] * Code for bug #32995.

---
 module/editor/control.php | 9 ++++++++-
 module/editor/model.php   | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/module/editor/control.php b/module/editor/control.php
index a03432e552..da2b0ba95c 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -160,9 +160,16 @@ class editor extends control
         {
             $filePath = helper::safe64Decode($filePath);
             if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) return print($this->lang->editor->editFileError);
+
+            $fileName = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
+            if(empty($fileName)) return print(js::error($this->lang->editor->emptyFileName));
+
             if($action != 'edit' and $action != 'newPage') $filePath = $this->editor->getSavePath($filePath, $action);
             if($action != 'edit' and $action != 'newPage' and file_exists($filePath) and !$this->post->override) return print(js::error($this->lang->editor->repeatFile));
-            if(!$this->editor->save($filePath)) return;
+
+            $result = $this->editor->save($filePath);
+            if(is_string($result)) return print(js::alert($result));
+
             echo js::reload('parent.parent.extendWin');
             return print(js::locate(inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=edit"), 'parent'));
         }
diff --git a/module/editor/model.php b/module/editor/model.php
index cc57e8760f..8feb42f355 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -327,14 +327,14 @@ class editorModel extends model
         /* Reduce expiration time for check safe file. */
         $this->config->safeFileTimeout = 15 * 60;
         $statusFile = $this->loadModel('common')->checkSafeFile();
-        if($statusFile) return print(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+        if($statusFile) return sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile));
 
         $dirPath     = dirname($filePath);
         $extFilePath = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS) + 4);
         if(!is_dir($dirPath) and is_writable($extFilePath)) mkdir($dirPath, 0777, true);
-        if(!is_dir($dirPath))      return print(js::alert(sprintf($this->lang->editor->notExists, $extFilePath)));
-        if(!is_writable($dirPath)) return print(js::alert(sprintf($this->lang->editor->notWritable, $extFilePath)));
-        if(strpos(strtolower(realpath($dirPath)), strtolower($this->app->getBasePath())) !== 0) return print(js::alert($this->lang->editor->editFileError));
+        if(!is_dir($dirPath))      return sprintf($this->lang->editor->notExists, $extFilePath);
+        if(!is_writable($dirPath)) return sprintf($this->lang->editor->notWritable, $extFilePath);
+        if(strpos(strtolower(realpath($dirPath)), strtolower($this->app->getBasePath())) !== 0) return $this->lang->editor->editFileError;
 
         $fileContent = $this->post->fileContent;
         $evils       = array('eval', 'exec', 'passthru', 'proc_open', 'shell_exec', 'system', '$$', 'include', 'require', 'assert', 'javascript', 'onclick');

From ad74bf740e47b0da6f71b429fd367e9a762e5fa9 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:45:57 +0800
Subject: [PATCH 28/49] * Adjust code .

---
 www/js/my.full.js | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index d3c9273a1e..2335435af6 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -95,30 +95,38 @@
                                         }
                                         else
                                         {
-                                            var formItem = $('#' + item.name);
+                                            var formItem = $('[name^=' + item.name + ']');
+                                            if (!(formItem.length && (formItem.attr('type') === 'radio' || formItem.attr('type') === 'checkbox')))
+                                            formItem = $('#' + item.name);
                                         }
 
                                         var tagName = formItem.prop('tagName');
                                         if(tagName === 'SELECT')
                                         {
-                                            formItem.val(item.value);
-                                            if($(formItem).hasClass('chosen'))
+                                            if($(formItem).attr('multiple'))
                                             {
+                                                if(!valueMultiple[item.name]) valueMultiple[item.name] = [];
+                                                valueMultiple[item.name].push(item.value);
+                                                if($(formItem).hasClass('picker-select'))
+                                                {
+                                                    $(formItem).trigger('change');
+                                                    $(formItem).data('zui.picker').setValue(valueMultiple[item.name]);
+                                                }
+                                                else if($(formItem).hasClass('chosen'))
+                                                {
+                                                    formItem.val(valueMultiple[item.name]);
+                                                    $(formItem).trigger('change');
+                                                    $(formItem).trigger('chosen:updated');
+                                                }
+                                            }
+                                            else if($(formItem).hasClass('chosen'))
+                                            {
+                                                formItem.val(item.value);
                                                 $(formItem).trigger('chosen:updated');
                                             }
                                             else if($(formItem).hasClass('picker-select'))
                                             {
-                                                if($(formItem).attr('multiple'))
-                                                {
-                                                    var value = [];
-                                                    if(!valueMultiple[item.name]) valueMultiple[item.name] = [];
-                                                    valueMultiple[item.name].push(item.value);
-                                                    $(formItem).data('zui.picker').setValue(valueMultiple[item.name]);
-                                                }
-                                                else
-                                                {
-                                                    $(formItem).data('zui.picker').setValue(item.value);
-                                                }
+                                                $(formItem).data('zui.picker').setValue(item.value);
                                             }
                                         }
                                         else if(tagName === 'TEXTAREA' && $(formItem).hasClass('kindeditor'))

From 73295587771db91ccc9a7ea8188350c2fdd60917 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Mar 2023 14:46:48 +0800
Subject: [PATCH 29/49]  * fix sonar error.

---
 framework/router.class.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index 11d4224ba6..edfc99616f 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -101,8 +101,6 @@ class router extends baseRouter
         global $lang;
         if(!is_object($lang)) $lang = new language();
 
-        $appName = '';
-
         /* Set productCommon and projectCommon for flow. */
         if($moduleName == 'common') $this->setCommonLang();
 
@@ -367,9 +365,6 @@ class router extends baseRouter
     public function loadModuleConfig($moduleName, $appName = '')
     {
         global $config;
-
-        $appName = '';
-
         if($config and (!isset($config->$moduleName) or !is_object($config->$moduleName))) $config->$moduleName = new stdclass();
 
         /* 初始化数组。Init the variables. */

From 4d7f1f8b0f3aa41af0f5f694f9cfa1669fbc34ff Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 14:57:46 +0800
Subject: [PATCH 30/49] * Adjust code .

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

diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index a6f24dad43..a5f36abaa7 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -47,7 +47,7 @@
   </div>
   <?php endif;?>
 
-  <form class='main-form form-ajax flex-1' method='post'>
+  <form class='main-form form-ajax flex-1' method='post' id="data-form-<?php echo $type?>">
     <div class="main-content">
       <div class="title-content flex">
         <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>

From 9d73aba355f70a4cc8f3ce8a8b213e86d74377b1 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:03:32 +0800
Subject: [PATCH 31/49] * Adjust code .

---
 www/js/my.full.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 2335435af6..89ba8e4535 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -23,7 +23,7 @@
     {
         if(config.currentModule.indexOf('workflow') !== -1) return;
 
-        var skipModules = ['repo', 'mr', 'job'];
+        var skipModules = ['repo', 'mr', 'job', 'dev', 'custom', 'editor'];
         if(skipModules.indexOf(config.currentModule) !== -1) return;
 
         var skipMethods = ['edit', 'import', 'login', 'export', 'finish', 'confirm', 'resolve', 'start', 'pause', 'cancel', 'report', 'close', 'activate', 'restart', 'suspend', 'putoff', 'browse', 'hangup', 'track', 'index', 'reply', 'manage', 'run', 'show'];

From df52363be3634826b1fe66105ecc3b8fe6ce8492 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 16 Mar 2023 07:10:56 +0000
Subject: [PATCH 32/49] * Fix bug#33020

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

diff --git a/module/mr/control.php b/module/mr/control.php
index 7d2e34b035..503fd7c6cc 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -39,7 +39,7 @@ class mr extends control
             ->andWhere('synced')->eq(1)
             ->orderBy('id')
             ->count();
-        if($repoCount == 0) $this->locate($this->repo->createLink('create'));
+        if($repoCount == 0) $this->locate($this->loadModel('repo')->createLink('create'));
 
         $repoID = $this->loadModel('repo')->saveState($repoID, $objectID);
         $repo   = $this->repo->getRepoByID($repoID);

From 8d16faa47d65c75b2f908cfb656374cdd13e02ff Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:11:00 +0800
Subject: [PATCH 33/49] * Code for bug #33021.

---
 module/common/lang/de.php | 2 +-
 module/common/lang/en.php | 2 +-
 module/common/lang/fr.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 94980fb14c..0c916d800e 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -90,7 +90,7 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Aktionen';
 $lang->restore         = 'Wiederherstellen';
-$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->confirmDraft    = 'Unsaved form is found. Do you want to restore it?';
 $lang->resume          = 'resume';
 $lang->comment         = 'Notiz';
 $lang->history         = 'Historie';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c041725072..715782f579 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -90,7 +90,7 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Action';
 $lang->restore         = 'Reset';
-$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->confirmDraft    = 'Unsaved form is found. Do you want to restore it?';
 $lang->resume          = 'resume';
 $lang->comment         = 'Note';
 $lang->history         = 'History';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e7496a09a8..502a64a84c 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -90,7 +90,7 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Action';
 $lang->restore         = 'Réinitialiser';
-$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->confirmDraft    = 'Unsaved form is found. Do you want to restore it?';
 $lang->resume          = 'resume';
 $lang->comment         = 'Note';
 $lang->history         = 'Historique';

From 90672816d83f52290b790826c2a67d61c4fa5db4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 15:16:15 +0800
Subject: [PATCH 34/49] * Code for task #76338.

---
 module/bug/view/edit.html.php | 2 +-
 module/bug/view/view.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 2a0e86dc51..6aa2684235 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -125,7 +125,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                     </div>
                   </td>
                 </tr>
-                <tr class='<?php if($product->shadow and isset($project) and !$project->multiple) echo 'hide'?>'>
+                <tr class='<?php if($product->shadow and isset($project) and $project->multiple) echo 'hide'?>'>
                   <th><?php echo $lang->bug->productplan;?></th>
                   <td>
                     <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control chosen'");?></span>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 1ef74093c0..0d38c5d2a4 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -161,7 +161,7 @@
                   <th><?php echo $lang->bug->fromCase;?></th>
                   <td><?php if($bug->case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion", '', true), "<i class='icon icon-sitemap'></i> {$lang->bug->fromCase}$lang->colon$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?></td>
                 </tr>
-                <tr valign='middle' class='<?php if($product->shadow and isset($project) and !empty($project->multiple)) echo 'hide'?>'>
+                <tr valign='middle' class='<?php if($product->shadow and isset($project) and empty($project->multiple)) echo 'hide'?>'>
                   <th><?php echo $lang->bug->productplan;?></th>
                   <td><?php if(!$bug->plan or !common::printLink('productplan', 'view', "planID=$bug->plan&type=bug", $bug->planName)) echo $bug->planName;?></td>
                 </tr>

From 5b3bef53c97948c7956f14aa565bab2250e937cf Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 07:35:29 +0000
Subject: [PATCH 35/49] * Fix bug #33018.

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

diff --git a/module/task/model.php b/module/task/model.php
index 085e38fa20..7326235312 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -125,6 +125,7 @@ class taskModel extends model
             ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
             ->setDefault('openedBy',   $this->app->user->account)
             ->setDefault('openedDate', helper::now())
+            ->setDefault('vision', $this->config->vision)
             ->cleanINT('execution,story,module')
             ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')

From a99ed812d3cc81849c2c6ea30f124f418f3a47de Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:37:12 +0800
Subject: [PATCH 36/49] * Code for bug #33010.

---
 module/product/view/ajaxgetdropmenu.html.php | 7 ++++---
 module/project/view/ajaxgetdropmenu.html.php | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 22e5ef33f6..ec8152a33a 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -19,6 +19,7 @@
 .productTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
 .productTree .tree li>.list-toggle {line-height: 24px;}
 .productTree .tree li.has-list.open:before {content: unset;}
+.tree.noProgram li {padding-left: 0;}
 
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 #swapper li > a {margin-top: 4px; margin-bottom: 4px;}
@@ -56,9 +57,9 @@ foreach($products as $programID => $programProducts)
 }
 $productsPinYin = common::convert2Pinyin($productNames);
 
-$myProductsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '';
-$normalProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '';
-$closedProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '';
+$myProductsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
+$normalProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
+$closedProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="tree noProgram">';
 
 foreach($products as $programID => $programProducts)
 {
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index b21bb7acc5..3bdffc5199 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -18,6 +18,7 @@
 .projectTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
 .projectTree .tree li>.list-toggle {line-height: 24px;}
 .projectTree .tree li.has-list.open:before {content: unset;}
+.tree.noProgram li {padding-left: 0;}
 
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 #swapper li > a {margin-top: 4px; margin-bottom: 4px;}

From 3cf36bb69d41e64fd7695d0c894d309d4dbfa1eb Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:47:18 +0800
Subject: [PATCH 37/49] * Adjust code .

---
 www/theme/default/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index b72d718dfa..2da6800364 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -8,6 +8,8 @@
 * @version     $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $
 * @link        http://www.zentao.net
 */
+
+.mt-md {margin-top: 100px!important;}
 /* Finish task #5068*/
 .main-table .table{cursor:pointer;}
 .table-striped > tbody > tr:nth-child(2n+1) > td, .table-striped > tbody > tr:nth-child(2n+1) > th{background:none;}

From e8e6cb2fad15df2eb9774f08f90e47072b37c1ec Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:52:28 +0800
Subject: [PATCH 38/49] * Adjust code .

---
 www/js/my.full.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 89ba8e4535..cced1e4556 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -31,6 +31,7 @@
         {
             if(config.currentMethod.indexOf(skipMethods[i]) === 0) return;
         };
+        var $messager;
 
         setTimeout(function()
         {
@@ -60,11 +61,12 @@
 
                 if(formDataStored && formDataStored.length)
                 {
-                    var message = lang.confirmDraft.replace('%name%', lang[config.currentModule] ? lang[config.currentModule] : '');
-                    new $.zui.Messager(message, {
-                        type: 'success',
+                    message   = lang.confirmDraft.replace('%name%', lang[config.currentModule] ? lang[config.currentModule] : '');
+                    $messager =  new $.zui.Messager(message, {
                         close: true,
+                        type: 'info',
                         placement: 'top',
+                        cssClass: 'mt-md messagger-zt ',
                         time: 0,
                         actions: [
                             {
@@ -173,6 +175,12 @@
                     if(res.result === 'success' || res.status === 'success') $.zui.store.remove(formID);
                 })
             }
+
+            $('body').one('click', function(e)
+            {
+                if($('.messager').length &&  !$.contains(e.target, $('.messager')))
+                $messager.destroy();
+            });
         }, 500);
     }
     handleSaveFormDraft();

From 1bc1e3fc0f97e257e18151469b84a3077b1ca8f4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:53:11 +0800
Subject: [PATCH 39/49] * Adjust code.

---
 module/product/view/ajaxgetdropmenu.html.php | 20 +++++++++---------
 module/project/view/ajaxgetdropmenu.html.php | 22 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index ec8152a33a..6e8f6d3d16 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -4,27 +4,27 @@
 <?php js::set('extra', $extra);?>
 <style>
 #navTabs {position: sticky; top: 0; background: #fff; z-index: 950;}
-#navTabs>li {padding: 0px 10px; display: inline-block}
-#navTabs>li>span {display: inline-block;}
-#navTabs>li>a {margin: 0!important; padding: 8px 0px; display: inline-block}
+#navTabs > li {padding: 0px 10px; display: inline-block}
+#navTabs > li > span {display: inline-block;}
+#navTabs > li > a {margin: 0!important; padding: 8px 0px; display: inline-block}
 
 #tabContent {margin-top: 5px; z-index: 900; max-width: 220px}
 .productTree ul {list-style: none; margin: 0}
 .productTree .products>ul {padding-left: 7px;}
-.productTree .products>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-.productTree .products>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.productTree .products>ul > li > div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.productTree .products>ul > li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
 .productTree li a i.icon {font-size: 15px !important;}
 .productTree li a i.icon:before {min-width: 16px !important;}
 .productTree li .label {position: unset; margin-bottom: 0;}
-.productTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
-.productTree .tree li>.list-toggle {line-height: 24px;}
+.productTree li > a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.productTree .tree li > .list-toggle {line-height: 24px;}
 .productTree .tree li.has-list.open:before {content: unset;}
 .tree.noProgram li {padding-left: 0;}
 
-#swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
+#swapper li > div.hide-in-search>a:focus, #swapper li > div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 #swapper li > a {margin-top: 4px; margin-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
-#swapper .tree li>.list-toggle {top: -1px;}
+#swapper .tree li > .list-toggle {top: -1px;}
 
 #subHeader .tree ul {display: block;}
 div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
@@ -169,7 +169,7 @@ $(function()
     $('.nav-tabs li span').hide();
     $('.nav-tabs li.active').find('span').show();
 
-    $('.nav-tabs>li a').click(function()
+    $('.nav-tabs > li a').click(function()
     {
         if($('#swapper input[type="search"]').val() == '')
         {
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 3bdffc5199..3d81502e2a 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -3,27 +3,27 @@
 <?php js::set('method', $method);?>
 <style>
 #navTabs {position: sticky; top: 0; background: #fff; z-index: 950;}
-#navTabs>li {padding: 0px 10px; display: inline-block}
-#navTabs>li>span {display: inline-block;}
-#navTabs>li>a {margin: 0!important; padding: 8px 0px; display: inline-block}
+#navTabs > li {padding: 0px 10px; display: inline-block}
+#navTabs > li > span {display: inline-block;}
+#navTabs > li > a {margin: 0!important; padding: 8px 0px; display: inline-block}
 
 #tabContent {margin-top: 5px; z-index: 900; max-width: 220px}
 .projectTree ul {list-style: none; margin: 0}
-.projectTree .projects>ul {padding-left: 7px;}
-.projectTree .projects>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-.projectTree .projects>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.projectTree .projects > ul {padding-left: 7px;}
+.projectTree .projects > ul > li > div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.projectTree .projects > ul > li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
 .projectTree li a i.icon {font-size: 15px !important;}
 .projectTree li a i.icon:before {min-width: 16px !important;}
 .projectTree li .label {position: unset; margin-bottom: 0;}
-.projectTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
-.projectTree .tree li>.list-toggle {line-height: 24px;}
+.projectTree li > a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.projectTree .tree li > .list-toggle {line-height: 24px;}
 .projectTree .tree li.has-list.open:before {content: unset;}
 .tree.noProgram li {padding-left: 0;}
 
-#swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
+#swapper li > div.hide-in-search>a:focus, #swapper li > div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 #swapper li > a {margin-top: 4px; margin-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
-#swapper .tree li>.list-toggle {top: -1px;}
+#swapper .tree li > .list-toggle {top: -1px;}
 
 #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;}
@@ -200,7 +200,7 @@ $(function()
     $('.nav-tabs li span').hide();
     $('.nav-tabs li.active').find('span').show();
 
-    $('.nav-tabs>li a').click(function()
+    $('.nav-tabs > li a').click(function()
     {
         if($('#swapper input[type="search"]').val() == '')
         {

From 131dcf5f24ddb4a2434940e2ed2541fb49f8097f Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 16 Mar 2023 15:54:11 +0800
Subject: [PATCH 40/49] * Fix bug #32960.

---
 module/execution/view/story.html.php | 3 ++-
 module/story/model.php               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index c0deffdee0..8412190f4c 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -271,6 +271,7 @@
           <?php foreach($stories as $key => $story):?>
           <?php
           $totalEstimate += $story->estimate;
+          $story->from    = $this->app->tab;
           ?>
           <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)
@@ -286,7 +287,7 @@
           <?php if(!empty($story->children)):?>
           <?php $i = 0;?>
           <?php foreach($story->children as $key => $child):?>
-          <?php $child->from = 'execution';?>
+          <?php $child->from = $this->app->tab;?>
           <?php $class  = $i == 0 ? ' table-child-top' : '';?>
           <?php $class .= ($i + 1 == count($story->children)) ? ' table-child-bottom' : '';?>
           <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);?>'>
diff --git a/module/story/model.php b/module/story/model.php
index ecefa374c6..0d6ad1c629 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5276,7 +5276,7 @@ class storyModel extends model
                 echo $story->version;
                 break;
             case 'actions':
-                if($tab == 'execution' || ($tab == 'project' && isset($_SESSION['multiple']) && empty($_SESSION['multiple'])))
+                if($tab == 'execution')
                 {
                     $menuType = 'execution';
                 }

From 53666d15807e09e5d9e74b858147f5ab67abc473 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 16:16:00 +0800
Subject: [PATCH 41/49] * Add the concept of default requirements.

---
 db/update18.2.sql       | 11 +++++++++++
 db/zentao.sql           | 17 ++++++++++++++---
 module/custom/model.php |  2 --
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/db/update18.2.sql b/db/update18.2.sql
index fd4f3e9f7e..10bb6bb055 100644
--- a/db/update18.2.sql
+++ b/db/update18.2.sql
@@ -2,3 +2,14 @@ ALTER TABLE `zt_lang` MODIFY COLUMN `section` varchar(50) NOT NULL;
 DELETE FROM `zt_grouppriv` WHERE `module` = 'dev' AND `method` = 'editor';
 REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','common','','setPercent','1');
 DROP TABLE IF EXISTS `zt_dimension`;
+
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
+('zh-tw', 'custom', 'URSRList', '1', '{"SRName":"\\u8edf\\u4ef6\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
+('zh-tw', 'custom', 'URSRList', '2', '{"SRName":"\\u7814\\u767c\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
+('zh-tw', 'custom', 'URSRList', '3', '{"SRName":"\\u8edf\\u9700","URName":"\\u7528\\u9700"}', '0'),
+('zh-tw', 'custom', 'URSRList', '4', '{"SRName":"\\u6545\\u4e8b","URName":"\\u53f2\\u8a69"}', '0'),
+('zh-tw', 'custom', 'URSRList', '5', '{"SRName":"\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
+('fr', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('fr', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0'),
+('de', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('de', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0');
diff --git a/db/zentao.sql b/db/zentao.sql
index 047ef4fa39..df4487c829 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -6381,11 +6381,22 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (12,'my','limited');
 
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
-('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
-('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),
+('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
 ('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
+('zh-tw', 'custom', 'URSRList', '1', '{"SRName":"\\u8edf\\u4ef6\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
+('zh-tw', 'custom', 'URSRList', '2', '{"SRName":"\\u7814\\u767c\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
+('zh-tw', 'custom', 'URSRList', '3', '{"SRName":"\\u8edf\\u9700","URName":"\\u7528\\u9700"}', '0'),
+('zh-tw', 'custom', 'URSRList', '4', '{"SRName":"\\u6545\\u4e8b","URName":"\\u53f2\\u8a69"}', '0'),
+('zh-tw', 'custom', 'URSRList', '5', '{"SRName":"\\u9700\\u6c42","URName":"\\u7528\\u6236\\u9700\\u6c42"}', '0'),
 ('en', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
-('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0');
+('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0'),
+('fr', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('fr', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0'),
+('de', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'),
+('de', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0');
 
 REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`projectType`,`createdBy`,`createdDate`,`editedBy`,`editedDate`,`deleted`) VALUES
 ('需求','10','request','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
diff --git a/module/custom/model.php b/module/custom/model.php
index b091e14b71..a390f12f77 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -577,7 +577,6 @@ class customModel extends model
     public function getURSRPairs()
     {
         $lang = $this->app->getClientLang();
-        $lang = $lang == 'zh-tw' ? 'zh-cn' : $lang;
         $langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)
             ->where('lang')->eq($lang)
             ->andWhere('module')->eq('custom')
@@ -659,7 +658,6 @@ class customModel extends model
     {
         $this->app->loadLang('custom');
         $lang = $this->app->getClientLang();
-        $lang = $lang == 'zh-tw' ? 'zh-cn' : $lang;
 
         $langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)
             ->where('lang')->eq($lang)

From 1cb2dc55d4f1311f94f46866de12c152d31a535a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 16:21:33 +0800
Subject: [PATCH 42/49] * Code for fix bug #33014.

---
 module/admin/lang/de.php    | 2 +-
 module/admin/lang/en.php    | 2 +-
 module/admin/lang/fr.php    | 2 +-
 module/admin/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 9829c02c0e..ac0302561d 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -106,7 +106,7 @@ $lang->admin->setModule->auditplan      = 'QA';
 $lang->admin->setModule->meeting        = 'Meeting';
 $lang->admin->setModule->roadmap        = 'Roadmap';
 $lang->admin->setModule->track          = 'Track';
-$lang->admin->setModule->UR             = 'URStroy';
+$lang->admin->setModule->UR             = $lang->URCommon;
 $lang->admin->setModule->researchplan   = 'Researchplan';
 $lang->admin->setModule->gapanalysis    = 'Gapanalysis';
 $lang->admin->setModule->storylib       = 'Story Lib';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 989d926c26..9094d6a330 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -106,7 +106,7 @@ $lang->admin->setModule->auditplan      = 'QA';
 $lang->admin->setModule->meeting        = 'Meeting';
 $lang->admin->setModule->roadmap        = 'Roadmap';
 $lang->admin->setModule->track          = 'Track';
-$lang->admin->setModule->UR             = 'URStroy';
+$lang->admin->setModule->UR             = $lang->URCommon;
 $lang->admin->setModule->researchplan   = 'Researchplan';
 $lang->admin->setModule->gapanalysis    = 'Gapanalysis';
 $lang->admin->setModule->storylib       = 'Story Lib';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 3c6b0b8179..99ae83495c 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -106,7 +106,7 @@ $lang->admin->setModule->auditplan      = 'QA';
 $lang->admin->setModule->meeting        = 'Meeting';
 $lang->admin->setModule->roadmap        = 'Roadmap';
 $lang->admin->setModule->track          = 'Track';
-$lang->admin->setModule->UR             = 'URStroy';
+$lang->admin->setModule->UR             = $lang->URCommon;
 $lang->admin->setModule->researchplan   = 'Researchplan';
 $lang->admin->setModule->gapanalysis    = 'Gapanalysis';
 $lang->admin->setModule->storylib       = 'Story Lib';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index bc4a35220a..2e8af2b073 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -106,7 +106,7 @@ $lang->admin->setModule->auditplan      = 'QA';
 $lang->admin->setModule->meeting        = '会议';
 $lang->admin->setModule->roadmap        = '路线图';
 $lang->admin->setModule->track          = '矩阵';
-$lang->admin->setModule->UR             = '用户需求';
+$lang->admin->setModule->UR             = $lang->URCommon;
 $lang->admin->setModule->researchplan   = '调研';
 $lang->admin->setModule->gapanalysis    = '培训';
 $lang->admin->setModule->storylib       = '需求库';

From 876f2bcc9e6c3fe7a6dab9d745c977019cc29032 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 16 Mar 2023 16:21:50 +0800
Subject: [PATCH 43/49] * Fix bug for export bug.

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

diff --git a/module/bug/config.php b/module/bug/config.php
index d9c707e2f2..16921034e9 100755
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -217,7 +217,7 @@ $config->bug->datatable->fieldList['project']['fixed']      = 'no';
 $config->bug->datatable->fieldList['project']['width']      = '120';
 $config->bug->datatable->fieldList['project']['required']   = 'no';
 $config->bug->datatable->fieldList['project']['control']    = 'hidden';
-$config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID');
+$config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID&');
 
 $config->bug->datatable->fieldList['execution']['title']      = 'execution';
 $config->bug->datatable->fieldList['execution']['fixed']      = 'no';

From 15c0a07a93ab15e33190badf5de8381b05a84d0c Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 16 Mar 2023 16:22:37 +0800
Subject: [PATCH 44/49] * Code for bug #32960.

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

diff --git a/module/story/model.php b/module/story/model.php
index 0d6ad1c629..7d8f7626c5 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5276,9 +5276,10 @@ class storyModel extends model
                 echo $story->version;
                 break;
             case 'actions':
-                if($tab == 'execution')
+                if($tab == 'execution' or ($tab == 'project' and isset($_SESSION['multiple']) and empty($_SESSION['multiple'])))
                 {
                     $menuType = 'execution';
+                    if($storyType == 'requirement') $menuType = 'browse';
                 }
                 else
                 {

From c18770de91dcf0fab7157ed327b4f1737c96f367 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 08:28:27 +0000
Subject: [PATCH 45/49] * Fix bug #32939.

---
 module/bug/css/browse.css | 1 +
 module/task/model.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index 260ea0ab1d..557dba00db 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -22,6 +22,7 @@ th.c-confirmed {text-align: center;}
 .c-severity {overflow: hidden; white-space: nowrap;}
 .c-keywords {overflow: hidden; white-space: nowrap;}
 .c-id {text-overflow: ellipsis; white-space: nowrap;}
+.c-toTask {overflow: hidden; white-space: nowrap;}
 
 .body-modal #mainMenu>.btn-toolbar {width: auto;}
 
diff --git a/module/task/model.php b/module/task/model.php
index 085e38fa20..71ca9f9516 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -189,6 +189,7 @@ class taskModel extends model
             if($bugID > 0)
             {
                 $this->dao->update(TABLE_TASK)->set('fromBug')->eq($bugID)->where('id')->eq($taskID)->exec();
+                $this->dao->update(TABLE_BUG)->set('toTask')->eq($taskID)->where('id')->eq($bugID)->exec();
                 $this->loadModel('action')->create('bug', $bugID, 'converttotask', '', $taskID);
             }
 

From 3e36d0bbae29a56d38dd9ad91fe84c3cde379b04 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Mar 2023 16:37:16 +0800
Subject: [PATCH 46/49] * Modify user priv language.

---
 module/dev/lang/de.php    | 4 ++--
 module/dev/lang/en.php    | 4 ++--
 module/dev/lang/fr.php    | 4 ++--
 module/dev/lang/zh-cn.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 2d3d7cc520..e648dff8e1 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -1,7 +1,7 @@
 <?php
 $lang->dev->common       = 'Entwicklung';
-$lang->dev->api          = 'API';
-$lang->dev->db           = 'Datenbank';
+$lang->dev->api          = 'API Document';
+$lang->dev->db           = 'Data Dictionary';
 $lang->dev->editor       = 'Bearbeiter';
 $lang->dev->translate    = 'Translate';
 $lang->dev->dbList       = 'Datenbank';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index fc609d9902..95bff27d80 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -1,7 +1,7 @@
 <?php
 $lang->dev->common       = 'Develop';
-$lang->dev->api          = 'API';
-$lang->dev->db           = 'Database';
+$lang->dev->api          = 'API Document';
+$lang->dev->db           = 'Data Dictionary';
 $lang->dev->editor       = 'Editor';
 $lang->dev->translate    = 'Translate';
 $lang->dev->dbList       = 'Database';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index fc609d9902..95bff27d80 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -1,7 +1,7 @@
 <?php
 $lang->dev->common       = 'Develop';
-$lang->dev->api          = 'API';
-$lang->dev->db           = 'Database';
+$lang->dev->api          = 'API Document';
+$lang->dev->db           = 'Data Dictionary';
 $lang->dev->editor       = 'Editor';
 $lang->dev->translate    = 'Translate';
 $lang->dev->dbList       = 'Database';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 0e5e117fd5..c01ab55b44 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -1,7 +1,7 @@
 <?php
 $lang->dev->common       = '二次开发';
-$lang->dev->api          = 'API';
-$lang->dev->db           = '数据库';
+$lang->dev->api          = '接口文档';
+$lang->dev->db           = '数据字典';
 $lang->dev->editor       = '编辑器';
 $lang->dev->translate    = '翻译';
 $lang->dev->dbList       = '数据库';

From 60e1885ccb786a22b834cbb00b6068d188cdb849 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 16 Mar 2023 16:38:24 +0800
Subject: [PATCH 47/49] * Revert the code for BI nav.

---
 module/upgrade/config.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index cdb1c343b8..7227c0aab4 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -405,18 +405,6 @@ $config->delete['17_8'][] = 'extension/max/common/ext/lang/fr/crystal.php';
 $config->delete['17_8'][] = 'extension/max/common/ext/lang/vi/crystal.php';
 $config->delete['18_0'][] = 'extension/max/custom/ext/view/mode.zentaomax.html.hook.php';
 $config->delete['18_0'][] = 'extension/max/my/ext/view/audit.html.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/de/report.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/en/report.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/fr/report.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/vi/report.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/zh-cn/report.php';
-$config->delete['18_0'][] = 'extension/biz/common/ext/lang/zh-tw/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/de/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/en/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/fr/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/vi/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/zh-cn/report.php';
-$config->delete['18_0'][] = 'extension/max/common/ext/lang/zh-tw/report.php';
 $config->delete['18_0'][] = 'extension/max/block/ext/config/zentaomax.php';
 $config->delete['18_0'][] = 'extension/biz/repo/ext/control/ajaxgetcommitinfo.php';
 $config->delete['18_0'][] = 'extension/biz/repo/ext/control/ajaxgetbranchesandtags.php';

From cb7b7561c48c554dfb5d616b9d01202c9dbc69ae Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 16 Mar 2023 17:11:31 +0800
Subject: [PATCH 48/49] * Fixed an issue where requirement concepts are
 inconsistent across language items.

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

diff --git a/module/dev/model.php b/module/dev/model.php
index 9d6ff2126f..47e14f5198 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -418,6 +418,7 @@ class devModel extends model
                 $originalLangs['SRCommon']        = $this->lang->dev->SR;
 
                 $URSRList = $this->loadModel('custom')->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                if(empty($URSRList)) $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&vision={$this->config->vision}");
                 $URSRList = array_shift($URSRList);
                 if($URSRList)
                 {
@@ -505,6 +506,7 @@ class devModel extends model
                 $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
                 $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
                 $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                if(empty($URSRList)) $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&vision={$this->config->vision}");
                 $URSRList = array_shift($URSRList);
                 if($URSRList)
                 {
@@ -1040,7 +1042,12 @@ class devModel extends model
             $_POST = array();
 
             $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($this->config->custom->URSR)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($language)->andWhere('module')->eq('custom')->fetch('value');
-            $oldValue = json_decode($oldValue);
+            $URSRList = $this->loadModel('custom')->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+            if(empty($URSRList)) $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&vision={$this->config->vision}");
+            $URSRList = array_shift($URSRList);
+
+            $this->config->custom->URSR = $URSRList->key;
+            $oldValue = json_decode($URSRList->value);
 
             $_POST['SRName'] = !empty($post['common_SRCommon']) ? $post['common_SRCommon'] : zget($oldValue, 'defaultSRName', $oldValue->SRName);
             $_POST['URName'] = !empty($post['common_URCommon']) ? $post['common_URCommon'] : zget($oldValue, 'defaultURName', $oldValue->URName);

From 2921c625d4bb1c5efc378ca71f9511389a05959c Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Mar 2023 17:14:02 +0800
Subject: [PATCH 49/49] * Code for bug #33000

---
 module/caselib/view/create.html.php | 2 +-
 www/js/my.full.js                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/caselib/view/create.html.php b/module/caselib/view/create.html.php
index 81db56d2c2..2c8ee99723 100644
--- a/module/caselib/view/create.html.php
+++ b/module/caselib/view/create.html.php
@@ -25,7 +25,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->caselib->desc;?></th>
-          <td><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
+          <td><?php echo html::textarea('desc', '', "rows=10 class='form-control kindeditor'");?></td>
         </tr>
         <?php $this->printExtendFields('', 'table');?>
         <tr>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index cced1e4556..478adaf7c5 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -31,7 +31,7 @@
         {
             if(config.currentMethod.indexOf(skipMethods[i]) === 0) return;
         };
-        var $messager;
+        var $messager = '';
 
         setTimeout(function()
         {
@@ -43,7 +43,7 @@
                 if($(form).attr('target') == 'hiddenwin')
                 {
                     var needSkip    = true;
-                    var keepModules = ['program', 'product', 'project', 'testcase'];
+                    var keepModules = ['program', 'product', 'project', 'testcase', 'execution', 'caselib'];
                     for(var i = 0; i < keepModules.length; i++)
                     {
                         if(needSkip && config.currentModule.indexOf(keepModules[i]) === 0) needSkip = false;
@@ -62,7 +62,7 @@
                 if(formDataStored && formDataStored.length)
                 {
                     message   = lang.confirmDraft.replace('%name%', lang[config.currentModule] ? lang[config.currentModule] : '');
-                    $messager =  new $.zui.Messager(message, {
+                    $messager = new $.zui.Messager(message, {
                         close: true,
                         type: 'info',
                         placement: 'top',