From 32337194dde1ebabcf72ca4c2fe46f7e1c95064b Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 14 Nov 2022 07:46:56 +0000
Subject: [PATCH 01/60]  * Adjust for feature review.

---
 module/release/css/browse.css       | 1 +
 module/release/model.php            | 4 ++--
 module/release/view/browse.html.php | 4 ++--
 module/release/view/view.html.php   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/release/css/browse.css b/module/release/css/browse.css
index 8c33b9fd78..dd6d856b51 100644
--- a/module/release/css/browse.css
+++ b/module/release/css/browse.css
@@ -1,5 +1,6 @@
 #releaseList {font-size: 13px;}
 td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+#releaseList tbody>tr:hover{background-color: unset!important;}
 .main-table tbody>tr>td:first-child{padding: 2px 8px!important;}
 
 .c-id {width: 60px}
diff --git a/module/release/model.php b/module/release/model.php
index 92d8aaa8d4..db12c0f417 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -31,7 +31,7 @@ class releaseModel extends model
             ->fetch();
         if(!$release) return false;
 
-        $release->builds = $this->dao->select('id, filePath, scmPath, name, project')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll();
+        $release->builds = $this->dao->select('id, filePath, scmPath, name, execution, project')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll();
 
         $this->loadModel('file');
         $release = $this->file->replaceImgURL($release, 'desc');
@@ -66,7 +66,7 @@ class releaseModel extends model
             ->page($pager)
             ->fetchAll();
 
-        $builds = $this->dao->select("t1.id, t1.name, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName")
+        $builds = $this->dao->select("t1.id, t1.name, t1.execution, IF(t2.name IS NOT NULL, t2.name, '') AS projectName, IF(t3.name IS NOT NULL, t3.name, '{$this->lang->trunk}') AS branchName")
             ->from(TABLE_BUILD)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->leftJoin(TABLE_BRANCH)->alias('t3')->on('t1.branch = t3.id')
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 5552c7eb28..3162da013b 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -52,7 +52,7 @@
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
         <th class='text-center c-build'><?php echo $lang->release->build;?></th>
-        <th class='text-center c-build'><?php echo $lang->release->project;?></th>
+        <th class='text-center c-project'><?php echo $lang->release->project;?></th>
         <th class='text-center c-status'><?php echo $lang->release->status;?></th>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php
@@ -82,7 +82,7 @@
           <?php if($product->type != 'normal'):?>
           <span class='label label-outline label-badge'><?php echo $build->branchName;?></span>
           <?php endif;?>
-          <?php echo html::a($this->createLink('build', 'view', "buildID=$build->id"), $build->name);?>
+          <?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name);?>
         </td>
         <td><?php echo $build->projectName;?></td>
         <?php if($i == 1):?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index dbb2394344..67054a46e2 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -357,7 +357,7 @@
                         foreach($release->builds as $build)
                         {
                             $buildDivision = $i == count($release->builds) ? '' : $lang->comma;
-                            echo (($build->project) ? html::a($this->createLink('build', 'view', "buildID=$build->id"), $build->name, '_blank') : $build->name) . $buildDivision;
+                            echo (($build->project) ? html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name, '_blank') : $build->name) . $buildDivision;
                             $i++;
                         }
                         ?>

From bb5b3426f61fd51dfa753a694a94f83754be79cc Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 14 Nov 2022 07:55:25 +0000
Subject: [PATCH 02/60] * Finish task #76032.

---
 module/bug/model.php              | 37 +++++++++++++++++++++----------
 module/build/control.php          |  2 +-
 module/build/lang/de.php          |  1 +
 module/build/lang/en.php          |  1 +
 module/build/lang/fr.php          |  1 +
 module/build/lang/vi.php          |  1 +
 module/build/lang/zh-cn.php       |  1 +
 module/build/model.php            | 31 ++++++++++++++++++++++++++
 module/build/view/create.html.php |  1 +
 9 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 5d17a0c4af..093a93235f 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1888,19 +1888,19 @@ class bugModel extends model
     /**
      * Get bugs of a execution.
      *
-     * @param  int    $executionID
-     * @param  int    $productID
-     * @param  int    $branchID
-     * @param  int    $build
-     * @param  string $type
-     * @param  int    $param
-     * @param  string $orderBy
-     * @param  string $excludeBugs
-     * @param  object $pager
+     * @param  int          $executionID
+     * @param  int          $productID
+     * @param  int          $branchID
+     * @param  string|array $builds
+     * @param  string       $type
+     * @param  int          $param
+     * @param  string       $orderBy
+     * @param  string       $excludeBugs
+     * @param  object       $pager
      * @access public
      * @return array
      */
-    public function getExecutionBugs($executionID, $productID = 0, $branchID = 'all', $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
+    public function getExecutionBugs($executionID, $productID = 0, $branchID = 'all', $builds = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
     {
         $type = strtolower($type);
         if(strpos($orderBy, 'pri_') !== false) $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
@@ -1935,15 +1935,28 @@ class bugModel extends model
         }
         else
         {
+            $condition = '';
+            if($builds)
+            {
+                if(!is_array($builds)) $builds = explode(',', $builds);
+
+                $conditions = array();
+                foreach($builds as $build)
+                {
+                    if($build) $conditions[] = "FIND_IN_SET('$build', t1.openedBuild)";
+                }
+                $condition = join(' OR ', $conditions);
+                $condition = "($condition)";
+            }
             $bugs = $this->dao->select("t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) as severityOrder")->from(TABLE_BUG)->alias('t1')
                 ->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module=t2.id')
                 ->where('t1.deleted')->eq(0)
                 ->beginIF(!empty($productID) and $branchID !== 'all')->andWhere('t1.branch')->eq($branchID)->fi()
-                ->beginIF(empty($build))->andWhere('t1.execution')->eq($executionID)->fi()
+                ->beginIF(empty($builds))->andWhere('t1.execution')->eq($executionID)->fi()
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
                 ->beginIF($type == 'unresolved')->andWhere('t1.status')->eq('active')->fi()
                 ->beginIF($type == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
-                ->beginIF($build)->andWhere("CONCAT(',', t1.openedBuild, ',') like '%,$build,%'")->fi()
+                ->beginIF($condition)->andWhere("$condition")->fi()
                 ->beginIF(!empty($param))->andWhere('t2.path')->like("%,$param,%")->andWhere('t2.deleted')->eq(0)->fi()
                 ->beginIF($excludeBugs)->andWhere('t1.id')->notIN($excludeBugs)->fi()
                 ->orderBy($orderBy)
diff --git a/module/build/control.php b/module/build/control.php
index 537ba935d0..8ccca340d5 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -292,7 +292,7 @@ class build extends control
         $this->view->storyPager = $storyPager;
 
         $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1);
-        $this->view->generatedBugs     = $this->bug->getExecutionBugs($build->execution, $build->product, 'all', $build->id, $type, $param, $type == 'generatedBug' ? $sort : 'status_desc,id_desc', '', $generatedBugPager);
+        $this->view->generatedBugs     = $this->bug->getExecutionBugs($build->execution, $build->product, 'all', "$build->id,{$build->builds}", $type, $param, $type == 'generatedBug' ? $sort : 'status_desc,id_desc', '', $generatedBugPager);
         $this->view->generatedBugPager = $generatedBugPager;
 
         $this->executeHooks($buildID);
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 102f2a399f..39f5f213c7 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -57,6 +57,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
 
 $lang->build->finishStories = "  %s {$lang->SRCommon} sind abgeschlossen.";
 $lang->build->resolvedBugs  = '  %s Bugs sind gelöst.';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 2cad705a92..df6d81e8d1 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -57,6 +57,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
 
 $lang->build->finishStories = "  Finished {$lang->SRCommon} %s";
 $lang->build->resolvedBugs  = '  Resolved Bug %s';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 5bf136f09b..30ed628f70 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -57,6 +57,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
 
 $lang->build->finishStories = "  {$lang->SRCommon} Terminées %s";
 $lang->build->resolvedBugs  = '  Bugs Résolus %s';
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index c5a6f474d1..830fb9234d 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -53,6 +53,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
 
 $lang->build->finishStories = "  {$lang->SRCommon} đã kết thúc %s";
 $lang->build->resolvedBugs  = '  Bug đã giải quyết %s';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index b1bbf9d7ca..0be8d8c8b5 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -57,6 +57,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "已经关联{$lang->SRCommon}、Bug或提交测试单的版本，不能修改其所属{$lang->productCommon}";
 $lang->build->notice->changeExecution = "提交测试单的版本，不能修改其所属{$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "提交测试单的版本，不能修改关联版本";
+$lang->build->notice->autoRelation    = "相关版本下完成的需求、解决的Bug、产生的Bug将会自动关联到项目版本中";
 
 $lang->build->finishStories = " 本次共完成 %s 个{$lang->SRCommon}";
 $lang->build->resolvedBugs  = ' 本次共解决 %s 个Bug';
diff --git a/module/build/model.php b/module/build/model.php
index 6a49cfb637..3aa47341da 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -336,6 +336,7 @@ class buildModel extends model
             ->remove('resolvedBy,allchecker,files,labels,uid')
             ->get();
 
+
         $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_BUILD)->data($build)
             ->autoCheck()
@@ -347,6 +348,7 @@ class buildModel extends model
         if(!dao::isError())
         {
             $buildID = $this->dao->lastInsertID();
+            $this->linkChildBuilds($buildID, $build->builds);
             $this->file->updateObjectID($this->post->uid, $buildID, 'build');
             $this->file->saveUpload('build', $buildID);
             $this->loadModel('score')->create('build', 'create', $buildID);
@@ -386,6 +388,8 @@ class buildModel extends model
         if(isset($build->branch) and $oldBuild->branch != $build->branch) $this->dao->update(TABLE_RELEASE)->set('branch')->eq($build->branch)->where('build')->eq($buildID)->exec();
         if(!dao::isError())
         {
+            $addBuilds = array_diff(explode(',', $build->builds), explode(',', $oldBuild->builds));
+            if($addBuilds) $this->linkChildBuilds($buildID, $addBuilds);
             $this->file->updateObjectID($this->post->uid, $buildID, 'build');
             return common::createChanges($oldBuild, $build);
         }
@@ -561,6 +565,33 @@ class buildModel extends model
         foreach($this->post->unlinkBugs as $unlinkBugID) $this->action->create('bug', $unlinkBugID, 'unlinkedfrombuild', '', $buildID);
     }
 
+    /**
+     * Bugs and stories associated with child builds.
+     *
+     * @param  int    $buildID
+     * @param  string    $childBuilds
+     * @access public
+     * @return void
+     */
+    public function linkChildBuilds($buildID, $childBuilds)
+    {
+        $build     = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
+        $buildList = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuilds)->fetchAll();
+
+        foreach($buildList as $buildInfo)
+        {
+            if($buildInfo->bugs)    $build->bugs    .= ",{$buildInfo->bugs}";
+            if($buildInfo->stories) $build->stories .= ",{$buildInfo->stories}";
+        }
+
+        $build->bugs    = explode(',', $build->bugs);
+        $build->bugs    = join(',', array_filter($build->bugs));
+        $build->stories = explode(',', $build->stories);
+        $build->stories = join(',', array_filter($build->stories));
+
+        $this->dao->update(TABLE_BUILD)->data($build)->where('id')->eq($buildID)->exec();
+    }
+
     /**
      * Build action menu.
      *
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 3297178af4..4d50e8e419 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -46,6 +46,7 @@
         <tr>
           <th><?php echo $lang->build->builds;?></th>
           <td id='buildBox'><?php echo html::select('builds', array(), '', "class='form-control chosen' multiple");?></td>
+          <td><?php echo $lang->build->notice->autoRelation;?></td>
         </tr>
         <?php endif;?>
         <tr>

From da374c2994837df54463dd238b34b2abd31ca71d Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 14 Nov 2022 07:56:51 +0000
Subject: [PATCH 03/60] * Optimize code.

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

diff --git a/module/build/model.php b/module/build/model.php
index 3aa47341da..0f98597790 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -336,7 +336,6 @@ class buildModel extends model
             ->remove('resolvedBy,allchecker,files,labels,uid')
             ->get();
 
-
         $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_BUILD)->data($build)
             ->autoCheck()

From f16bef503e0bbce41901a0d4b4c2e9fde33b11d8 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 14 Nov 2022 07:59:22 +0000
Subject: [PATCH 04/60] * Fix bug.

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

diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 4d50e8e419..6a26488df3 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -45,7 +45,7 @@
         <?php if($app->tab == 'project' && !empty($multipleProject)):?>
         <tr>
           <th><?php echo $lang->build->builds;?></th>
-          <td id='buildBox'><?php echo html::select('builds', array(), '', "class='form-control chosen' multiple");?></td>
+          <td id='buildBox'><?php echo html::select('builds[]', array(), '', "class='form-control chosen' multiple");?></td>
           <td><?php echo $lang->build->notice->autoRelation;?></td>
         </tr>
         <?php endif;?>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 8fc810e5aa..59e3009c6a 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -47,7 +47,13 @@
         <tr>
           <th><?php echo $lang->build->builds;?></th>
           <td id='buildBox'><?php echo html::select('builds[]', $builds, $build->builds, "class='form-control chosen' multiple $disabled");?></td>
-          <td><?php if($disabled) echo $lang->build->notice->changeBuilds;?></td>
+          <td>
+            <?php if($disabled):?>
+            <?php echo $lang->build->notice->changeBuilds;?>
+            <?php else:?>
+            <?php echo $lang->build->notice->autoRelation;?>
+            <?php endif;?>
+          </td>
         </tr>
         <?php elseif(!empty($multipleProject)):?>
         <th><?php echo $lang->build->execution;?></th>

From 27086ff4a2d7701de8e090c71a5de6fedc37cc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 14 Nov 2022 16:20:23 +0800
Subject: [PATCH 05/60]  * fix bug.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 5d17a0c4af..1b75576105 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2086,6 +2086,7 @@ class bugModel extends model
             ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.id = t2.execution')
             ->where('t2.id')->in($buildID)
             ->fetchAll('id');
+        if(empty($executions)) return array();
 
         $condition = 'execution NOT ' . helper::dbIN(array_keys($executions));
         $minBegin  = '';

From 8e481418df6f06cbbe96607f8dadafad0bb7d15e Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 14 Nov 2022 16:20:32 +0800
Subject: [PATCH 06/60] * Finish task #76107.

---
 module/project/css/create.css       | 1 +
 module/project/lang/de.php          | 1 +
 module/project/lang/en.php          | 1 +
 module/project/lang/fr.php          | 1 +
 module/project/lang/vi.php          | 1 +
 module/project/lang/zh-cn.php       | 1 +
 module/project/view/create.html.php | 5 ++++-
 7 files changed, 10 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 module/project/css/create.css

diff --git a/module/project/css/create.css b/module/project/css/create.css
old mode 100644
new mode 100755
index 8d3216532d..65133863d7
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -28,3 +28,4 @@
 .futureBox {vertical-align: top !important; padding-top: 13px !important;}
 #linkPlan {padding-top: 25px !important;}
 #projectType {padding-top: 7px !important;}
+.division .icon-help {margin-left: 15px}
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 4b8ee503f6..bd13cedc2e 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -358,6 +358,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 1c39189c08..7024b40b3e 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index cd16ce6b50..4bd82436cd 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = 'La date de début du projet "%s" doit ê
 $lang->project->endGreateExecution   = 'La date de fin du projet "%s" doit être ≥ à la date de fin maximale d\'exécution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index ec1120b68e..1996af20a1 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -244,6 +244,7 @@ $lang->project->endGreaterParent  = "The end date of the parent project: %s. It
 $lang->project->beginGreateChild  = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set.";
 $lang->project->endLetterChild    = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set.";
 $lang->project->childLongTime     = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
+$lang->project->divisionTips      = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 8c079f17be..edad53d25b 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -365,6 +365,7 @@ $lang->project->begigLetterExecution = '项目的开始日期应小于等于执
 $lang->project->endGreateExecution   = '项目的完成日期应大于等于执行的最大完成日期：%s';
 $lang->project->childLongTime        = "子项目中有长期项目，父项目也应该是长期项目";
 $lang->project->confirmUnlinkMember  = "您确定从该项目中移除该用户吗？";
+$lang->project->divisionTips         = "当前项目为单套阶段，点击[开启]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 7bcc9b33ec..f80f3bea14 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -199,7 +199,10 @@
         <?php if($model == 'waterfall'):?>
         <tr class='hide division'>
           <th><?php echo $lang->project->division;?></th>
-          <td colspan='3'><?php echo html::radio('division', $lang->project->divisionList, '0');?></td>
+          <td>
+            <?php echo html::radio('division', $lang->project->divisionList, '0');?>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->divisionTips;?>"></icon>
+          </td>
         </tr>
         <?php endif;?>
         <?php if($model == 'kanban'):?>

From 44c503e22f2e313babe1bca515d1307690ed5eeb Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 14 Nov 2022 08:33:47 +0000
Subject: [PATCH 07/60]  * Finish task #76035,#76036.

---
 module/release/control.php | 62 ++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/module/release/control.php b/module/release/control.php
index 6327b37398..c1fc6a7af6 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -464,7 +464,6 @@ class release extends control
         $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product');
 
         $release = $this->release->getById($releaseID);
-        $build   = $this->loadModel('build')->getByID($release->build);
         $this->commonAction($release->product);
         $this->loadModel('story');
         $this->loadModel('tree');
@@ -475,15 +474,21 @@ class release extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Build search form. */
-        $queryID = ($browseType == 'bySearch') ? (int)$param : 0;
         unset($this->config->product->search['fields']['product']);
         unset($this->config->product->search['fields']['project']);
+
+        $queryID = ($browseType == 'bySearch') ? (int)$param : 0;
         $this->config->product->search['actionURL'] = $this->createLink('release', 'view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['style']     = 'simple';
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairsForStory($release->product, $release->branch, 'skipParent|withMainPlan');
         $this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
-        $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($release->product, 'story', 0, $release->branch);;
+
+        $searchModules = array();
+        $moduleGroups  = $this->loadModel('tree')->getOptionMenu($release->product, 'story', 0, explode(',', $release->branch));;
+        foreach($moduleGroups as $modules) $searchModules += $modules;
+        $this->config->product->search['params']['module']['values'] = $searchModules;
+
         if($this->session->currentProductType == 'normal')
         {
             unset($this->config->product->search['fields']['branch']);
@@ -491,20 +496,30 @@ class release extends control
         }
         else
         {
-            $this->config->product->search['fields']['branch'] = $this->lang->product->branch;
-            $branchName = $this->loadModel('branch')->getById($release->branch);
-            $branches   = array('' => '', BRANCH_MAIN => $this->lang->branch->main, $release->branch => $branchName);
+            $allBranchs = $this->loadModel('branch')->getPairs($release->product);
+            $branches   = array('' => '', BRANCH_MAIN => $this->lang->branch->main);
+            foreach(explode(',', trim($release->branch, ',')) as $branchID) $branches[$branchID] = zget($allBranchs, $branchID);
+
+            $this->config->product->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$release->productType]);
             $this->config->product->search['params']['branch']['values'] = $branches;
         }
         $this->loadModel('search')->setSearchParams($this->config->product->search);
 
-        if($browseType == 'bySearch' or $build->execution == 0)
+        $builds = $this->loadModel('build')->getByList($release->build);
+        $executionIdList = array();
+        foreach($builds as $build)
         {
-            $allStories = $this->story->getBySearch($release->product, "0,{$release->branch}", $queryID, 'id', $build->execution ? $build->execution : '', 'story', $release->stories, $pager);
+            if(empty($build->execution)) continue;
+            $executionIdList[$build->execution] = $build->execution;
+        }
+
+        if($browseType == 'bySearch')
+        {
+            $allStories = $this->story->getBySearch($release->product, $release->branch, $queryID, 'id', $executionIdList, 'story', $release->stories, $pager);
         }
         else
         {
-            $allStories = $this->story->getExecutionStories($build->execution, $build->product, 0, 't1.`order`_desc', 'byBranch', $release->branch, 'story', $release->stories, $pager);
+            $allStories = $this->story->getExecutionStories($executionIdList, $build->product, 0, 't1.`order`_desc', 'byBranch', $release->branch, 'story', $release->stories, $pager);
         }
 
         $this->view->allStories     = $allStories;
@@ -584,7 +599,6 @@ class release extends control
         $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
         /* Set menu. */
         $release = $this->release->getByID($releaseID);
-        $build   = $this->loadModel('build')->getByID($release->build);
         $this->commonAction($release->product);
 
         /* Load pager. */
@@ -593,17 +607,24 @@ class release extends control
 
         /* Build the search form. */
         $this->loadModel('bug');
-        $queryID = ($browseType == 'bysearch') ? (int)$param : 0;
         unset($this->config->bug->search['fields']['product']);
         unset($this->config->bug->search['fields']['project']);
+
+        $queryID = ($browseType == 'bysearch') ? (int)$param : 0;
         $this->config->bug->search['actionURL'] = $this->createLink('release', 'view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->bug->search['queryID']   = $queryID;
         $this->config->bug->search['style']     = 'simple';
+
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getPairsForStory($release->product, $release->branch, 'skipParent|withMainPlan');
         $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($release->product, $release->branch);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getBuildPairs($release->product, $branch = 'all', $params = '');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
-        $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($release->product, 'bug', 0, $release->branch);
+
+        $searchModules = array();
+        $moduleGroups  = $this->loadModel('tree')->getOptionMenu($release->product, 'bug', 0, explode(',', $release->branch));
+        foreach($moduleGroups as $modules) $searchModules += $modules;
+        $this->config->bug->search['params']['module']['values'] = $searchModules;
+
         if($this->session->currentProductType == 'normal')
         {
             unset($this->config->bug->search['fields']['branch']);
@@ -611,28 +632,31 @@ class release extends control
         }
         else
         {
-            $this->config->bug->search['fields']['branch'] = $this->lang->product->branch;
-            $branchName = $this->loadModel('branch')->getById($release->branch);
-            $branches   = array('' => '', BRANCH_MAIN => $this->lang->branch->main, $release->branch => $branchName);
+            $allBranchs = $this->loadModel('branch')->getPairs($release->product);
+            $branches   = array('' => '', BRANCH_MAIN => $this->lang->branch->main);
+            foreach(explode(',', trim($release->branch, ',')) as $branchID) $branches[$branchID] = zget($allBranchs, $branchID);
+
+            $this->config->bug->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$release->productType]);
             $this->config->bug->search['params']['branch']['values'] = $branches;
         }
         $this->loadModel('search')->setSearchParams($this->config->bug->search);
 
+        $builds      = $this->loadModel('build')->getByList($release->build);
         $allBugs     = array();
         $releaseBugs = $type == 'bug' ? $release->bugs : $release->leftBugs;
-        if($browseType == 'bySearch' or $build->execution == 0)
+        if($browseType == 'bySearch')
         {
             $allBugs = $this->bug->getBySearch($release->product, $release->branch, $queryID, 'id_desc', $releaseBugs, $pager);
         }
-        elseif($build->execution)
+        else
         {
             if($type == 'bug')
             {
-                $allBugs = $this->bug->getReleaseBugs($build->id, $release->product, $release->branch, $releaseBugs, $pager);
+                $allBugs = $this->bug->getReleaseBugs(array_keys($builds), $release->product, $release->branch, $releaseBugs, $pager);
             }
             elseif($type == 'leftBug')
             {
-                $allBugs = $this->bug->getProductLeftBugs($build->id, $release->product, $release->branch, $releaseBugs, $pager);
+                $allBugs = $this->bug->getProductLeftBugs(array_keys($builds), $release->product, $release->branch, $releaseBugs, $pager);
             }
         }
 

From 9627f33b3b966f32615f320354b53c26e0bea29b Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 14 Nov 2022 08:37:07 +0000
Subject: [PATCH 08/60] * Fix bug #29711.

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index a43f1cba34..4d4d80de04 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -221,7 +221,7 @@
       <?php
       $datatableId  = $this->moduleName . ucfirst($this->methodName);
       $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
-      $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = "executionID={$execution->id}&storyType=$storyType&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       if($useDatatable) include '../../common/view/datatable.html.php';
       if(!$execution->hasProduct and !$execution->multiple)

From a1cb1c3556c4376cad01268746589fe44e667236 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 14 Nov 2022 08:37:21 +0000
Subject: [PATCH 09/60]  * Get bug modules.

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

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 64a5d6b9e9..f2d8398c9b 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -693,7 +693,7 @@ class projectrelease extends control
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
 
         $searchModules = array();
-        $moduleGroups  = $this->loadModel('tree')->getOptionMenu($release->product, 'story', 0, explode(',', $release->branch));
+        $moduleGroups  = $this->loadModel('tree')->getOptionMenu($release->product, 'bug', 0, explode(',', $release->branch));
         foreach($moduleGroups as $modules) $searchModules += $modules;
         $this->config->bug->search['params']['module']['values'] = $searchModules;
 

From e3ad1649a899ea191c89bd92c5b65588abd61544 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Mon, 14 Nov 2022 09:02:27 +0000
Subject: [PATCH 10/60] * Fix bug #29565.

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

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index fc9aae6e29..de9280d5d1 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -791,6 +791,7 @@ if(!helper::hasFeature('devops'))
     unset($lang->mainNav->devops,         $lang->mainNav->menuOrder[35]);
     unset($lang->scrum->menu->devops,     $lang->scrum->menuOrder[25]);
     unset($lang->waterfall->menu->devops, $lang->waterfall->menuOrder[35]);
+    unset($lang->execution->menu->devops, $lang->execution->menuOrder[45]);
 }
 
 if(!helper::hasFeature('kanban'))

From c512ab0d730c4ac016a538b803dd43fa193e9ec6 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 14 Nov 2022 17:06:33 +0800
Subject: [PATCH 11/60] * finish task #75912

---
 module/execution/control.php | 18 ++++++++++++++++++
 module/story/model.php       |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 6d0e3736eb..9dbd9647bb 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1733,10 +1733,28 @@ class execution extends control
             $this->view->linkedBranches = $linkedBranches;
         }
 
+        if(!$project->hasProduct)
+        {
+            $shadowProduct = $this->loadModel('product')->getShadowProductByProject($project->id);
+            $productPlan   = $this->loadModel('productplan')->getPairs($shadowProduct->id, '0,0', 'noclosed,unexpired', true);
+        }
+
         if(!empty($_POST))
         {
             if(isset($_POST['attribute']) and in_array($_POST['attribute'], array('request', 'design', 'review'))) unset($_POST['plans']);
 
+            /* No product execution link plans. */
+            if(!$project->hasProduct and !empty($_POST['plans']))
+            {
+                $plansItem = array();
+                foreach($_POST['plans'] as $planItem)
+                {
+                    if(empty($planItem[0][0])) continue;
+                    $plansItem[] = $planItem[0][0];
+                }
+                $_POST['plans'] = array($_POST['products'][0] => array(0 => $plansItem));
+            }
+
             $executionID = $this->execution->create($copyExecutionID);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
diff --git a/module/story/model.php b/module/story/model.php
index ce627b9b37..c7769f426f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4218,7 +4218,7 @@ class storyModel extends model
         if($action == 'batchcreate' and $story->parent > 0) return false;
         if($action == 'batchcreate' and $story->type == 'requirement' and $story->status != 'closed') return strpos('draft,reviewing,changing', $story->status) === false;
         if($action == 'batchcreate' and $config->vision == 'lite' and ($story->status == 'active' and ($story->stage == 'wait' or $story->stage == 'projected'))) return true;
-        /* Adjust code, hide split entry, fix bug #29432. */
+        /* Adjust code, hide split entry. */
         if($action == 'batchcreate' and ($story->status != 'active' or (isset($shadowProducts[$story->product])) or (!isset($shadowProducts[$story->product]) && $story->stage != 'wait') or !empty($story->plan))) return false;
 
         return true;
@@ -4489,7 +4489,7 @@ class storyModel extends model
 
                 $executionID = empty($execution) ? 0 : $execution->id;
 
-                /* Adjust code, hide split entry, fix bug #29432. */
+                /* Adjust code, hide split entry. */
                 if(common::hasPriv('story', 'batchCreate') and !$execution->multiple and !$execution->hasProduct and false)
                 {
                     $isClick = $this->isClickable($story, 'batchcreate');

From 72ed3ae2273676800b65111b587a9b8b95cd187e Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Mon, 14 Nov 2022 17:22:03 +0800
Subject: [PATCH 12/60] * Fix bug #28832.

---
 module/execution/view/storykanban.html.php | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/module/execution/view/storykanban.html.php b/module/execution/view/storykanban.html.php
index cae4f2b63a..89bacb292c 100644
--- a/module/execution/view/storykanban.html.php
+++ b/module/execution/view/storykanban.html.php
@@ -12,8 +12,9 @@
 <?php js::set('confirmUnlinkStory', $lang->execution->confirmUnlinkStory)?>
 <?php js::set('canBeChanged', $canBeChanged)?>
 <?php
-$cols    = array('projected', 'developing', 'developed', 'testing', 'tested', 'verified', 'released');
-$account = $this->app->user->account;
+$cols         = array('projected', 'developing', 'developed', 'testing', 'tested', 'verified', 'released');
+$account      = $this->app->user->account;
+$canLinkStory = $execution->hasProduct or $execution->multiple;
 ?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -59,9 +60,24 @@ $account = $this->app->user->account;
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->story->noStory;?></span>
-      <?php if($canBeChanged and common::hasPriv('execution', 'linkStory')):?>
-      <?php echo html::a($this->createLink('execution', 'linkStory', "execution=$execution->id"), "<i class='icon icon-link'></i> " . $lang->execution->linkStory, '', "class='btn btn-info'");?>
-      <?php endif;?>
+      <?php
+      if(common::canModify('execution', $execution))
+      {
+          if($canLinkStory and $canBeChanged and common::hasPriv('execution', 'linkStory'))
+          {
+              echo html::a($this->createLink('execution', 'linkStory', "execution=$execution->id"), "<i class='icon icon-link'></i> " . $lang->execution->linkStory, '', "class='btn btn-info'");
+          }
+          else
+          {
+              $storyModuleID = (int)$this->cookie->storyModuleParam;
+              if(common::hasPriv('story', 'create'))
+              {
+                  $createStoryLink = $this->createLink('story', 'create', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id");
+                  echo html::a($createStoryLink, "<i class='icon icon-plus'></i> " . $lang->execution->createStory, '', "class='btn btn-info' data-app=$app->tab");
+              }
+          }
+      }
+      ?>
     </p>
   </div>
   <?php else:?>

From 3c7a9fd2851d5aaed014020400bea5d3d9f2b4fc Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Mon, 14 Nov 2022 18:50:13 +0800
Subject: [PATCH 13/60] - Remove getLatestRelease method.

---
 module/install/model.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/module/install/model.php b/module/install/model.php
index 4d4d302c96..230a75db1c 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -51,24 +51,6 @@ class installModel extends model
         return PHP_VERSION;
     }
 
-    /**
-     * Get latest release.
-     *
-     * @access public
-     * @return string or bool
-     */
-    public function getLatestRelease()
-    {
-        if(!function_exists('json_decode')) return false;
-        $result = file_get_contents('https://www.zentao.net/misc-getlatestrelease.json');
-        if($result)
-        {
-            $result = json_decode($result);
-            if(isset($result->release) and $this->config->version != $result->release->version) return $result->release;
-        }
-        return false;
-    }
-
     /**
      * Check php version.
      *

From 92f6e026bbab86ddaeea590fa1a968b21d26958c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 08:36:22 +0800
Subject: [PATCH 14/60] * Fix bug#29449.

---
 module/story/control.php          | 4 ++++
 module/story/view/create.html.php | 4 ++--
 module/story/view/edit.html.php   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 6cffa44848..cc784cdfde 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -396,6 +396,7 @@ class story extends control
 
         /* Hidden some fields of projects without products. */
         $this->view->hiddenProduct = false;
+        $this->view->hiddenParent  = false;
         $this->view->hiddenPlan    = false;
         $this->view->hiddenURS     = false;
         $this->view->teamUsers     = array();
@@ -409,6 +410,7 @@ class story extends control
             {
                 $this->view->teamUsers     = $this->project->getTeamMemberPairs($project->id);
                 $this->view->hiddenProduct = true;
+                $this->view->hiddenParent  = true;
 
                 if($project->model !== 'scrum')  $this->view->hiddenPlan = true;
                 if(!$project->multiple)          $this->view->hiddenPlan = true;
@@ -883,6 +885,7 @@ class story extends control
 
         /* Hidden some fields of projects without products. */
         $this->view->hiddenProduct = false;
+        $this->view->hiddenParent  = false;
         $this->view->hiddenPlan    = false;
         $this->view->hiddenURS     = false;
         $this->view->teamUsers     = array();
@@ -892,6 +895,7 @@ class story extends control
             $project = $this->project->getByShadowProduct($product->id);
             $this->view->teamUsers     = $this->project->getTeamMemberPairs($project->id);
             $this->view->hiddenProduct = true;
+            $this->view->hiddenParent  = true;
 
             if($project->model !== 'scrum')  $this->view->hiddenPlan = true;
             if(!$project->multiple)          $this->view->hiddenPlan = true;
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 5ba9b5c1a0..fd7340c9cd 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -161,7 +161,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
           <tr>
             <th><?php echo $hiddenURS ? $lang->story->parent : $lang->story->requirement;?></th>
             <td colspan="2" class="<?php if($hiddenURS) echo 'hidden';?>"><?php echo html::select('URS[]', $URS, '', "class='form-control chosen' multiple");?></td>
-            <td colspan="2">
+            <td colspan="2" <?php if($hiddenParent) echo 'hidden';?>>
               <div class='input-group' id='moduleIdBox'>
                 <?php if(!$hiddenURS):?>
                 <div class="input-group-addon"><?php echo $lang->story->parent;?></div>
@@ -171,7 +171,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
             </td>
           </tr>
           <?php else:?>
-          <tr>
+          <tr <?php if($hiddenParent) echo 'hidden';?>>
             <th><?php echo $lang->story->parent;?></th>
             <td colspan="4"><?php echo html::select('parent', $stories, '', "class='form-control chosen'");?></td>
           </tr>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index df89e7043a..ea2bc86610 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -166,7 +166,7 @@
                 </td>
               </tr>
               <?php if($story->parent >= 0 and $story->type == 'story'):?>
-              <tr>
+              <tr class="<?php if($hiddenParent) echo 'hidden';?>">
                 <th><?php echo $lang->story->parent;?></th>
                 <td><?php echo html::select('parent', $stories, $story->parent, "class='form-control chosen'");?></td>
               </tr>

From 864ed7a391ff7b629030cf8168ab65245238fbf9 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:04:14 +0800
Subject: [PATCH 15/60] * Fix bug#29445.

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

diff --git a/module/task/js/create.js b/module/task/js/create.js
index 36e63a45ff..0dcd61d073 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -343,7 +343,7 @@ function setStories(moduleID, executionID)
         $("#story").addClass('filled').chosen();
 
         /* If there is no story option, select will be hidden and text will be displayed; otherwise, the opposite is true */
-        if($('#story option').length > 1)
+        if($('#story option').length > 1 || parseInt(hasProduct) == 0)
         {
             $('#story').parent().removeClass('hidden');
             $('#storyBox').addClass('hidden');
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index f66321ccb0..8e2f516d47 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -23,6 +23,7 @@
 <?php js::set('estimateNotEmpty', sprintf($lang->error->gt, $lang->task->estimate, '0'))?>
 <?php js::set('lifetime', $execution->lifetime);?>
 <?php js::set('lifetimeList', $lifetimeList);?>
+<?php js::set('hasProduct', $execution->hasProduct);?>
 <?php
 $requiredFields = array();
 foreach(explode(',', $config->task->create->requiredFields) as $field)

From e37ee336f3b5e45bb9cf4014ec15cadc8f2c8253 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:06:17 +0800
Subject: [PATCH 16/60] * finish task #75908

---
 module/search/model.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/search/model.php b/module/search/model.php
index fb686c62ae..fda31e9aac 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -973,10 +973,11 @@ class searchModel extends model
         if($this->app->user->admin) return $results;
 
         $this->loadModel('doc');
-        $products   = $this->app->user->view->products;
-        $programs   = $this->app->user->view->programs;
-        $projects   = $this->app->user->view->projects;
-        $executions = $this->app->user->view->sprints;
+        $products       = $this->app->user->view->products;
+        $shadowProducts = $this->dao->select('id')->from(TABLE_PRODUCT)->where('shadow')->eq(1)->fetchPairs('id');
+        $programs       = $this->app->user->view->programs;
+        $projects       = $this->app->user->view->projects;
+        $executions     = $this->app->user->view->sprints;
 
         $objectPairs = array();
         $total       = count($results);
@@ -1014,6 +1015,7 @@ class searchModel extends model
                 foreach($objectIdList as $productID => $recordID)
                 {
                     if(strpos(",$products,", ",$productID,") === false) unset($results[$recordID]);
+                    if(in_array($productID, $shadowProducts)) unset($results[$recordID]);
                 }
             }
             elseif($objectType == 'program')

From e86d77094d73d0564ea3d822965c8ae1ce52869e Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:09:35 +0800
Subject: [PATCH 17/60] * finish task #75904

---
 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 6cffa44848..ad3acb388b 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1085,7 +1085,7 @@ class story extends control
         }
 
         /* Set ditto option for users. */
-        $users = $this->loadModel('user')->getPairs('nodeleted');
+        $users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
         $users = array('' => '', 'ditto' => $this->lang->story->ditto) + $users;
 
         /* Set Custom*/

From 2758547f47702c725e69d3042fa83b9934159a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 09:10:03 +0800
Subject: [PATCH 18/60]  * adjust code for build-view link in projectrelease
 module.

---
 module/my/view/audit.html.php              |  2 +-
 module/projectrelease/model.php            | 24 ++++++++++++++++++++--
 module/projectrelease/view/browse.html.php | 12 +++++------
 module/projectrelease/view/view.html.php   |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 3d9d3bc8a4..3a999df645 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -55,7 +55,7 @@
       $type = $review->type;
       if($type == 'project') $type = 'review';
 
-      $typeName = $lang->$type->common;
+      $typeName = $lang->{$review->type}->common;
       if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
 
       $statusList = $lang->$type->statusList;
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index b3c76e6c56..17bd84efef 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -38,7 +38,7 @@ class projectreleaseModel extends model
         $this->loadModel('file');
         $release = $this->file->replaceImgURL($release, 'desc');
         $release->files      = $this->file->getByObject('release', $releaseID);
-        $release->buildInfos = $this->dao->select('id,project,product,name,scmPath,filePath')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id');
+        $release->buildInfos = $this->dao->select('id,project,product,execution,name,scmPath,filePath')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id');
         if(empty($release->files))$release->files = $this->file->getByObject('build', $release->build);
         if($setImgSize) $release->desc = $this->file->setImgSize($release->desc);
         return $release;
@@ -55,7 +55,7 @@ class projectreleaseModel extends model
      */
     public function getList($projectID, $type = 'all', $orderBy = 't1.date_desc', $pager = null)
     {
-        return $this->dao->select('t1.*, t2.name as productName')->from(TABLE_RELEASE)->alias('t1')
+        $releases = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_RELEASE)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere("FIND_IN_SET($projectID, t1.project)")
@@ -64,6 +64,26 @@ class projectreleaseModel extends model
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();
+
+        $buildIdList = array();
+        foreach($releases as $release)
+        {
+            $release->project = trim($release->project, ',');
+            $release->branch  = trim($release->branch, ',');
+            $release->build   = trim($release->build, ',');
+            $buildIdList = array_merge($buildIdList, explode(',', $release->build));
+        }
+
+        $builds = $this->dao->select("id,project,product,execution,name,scmPath,filePath")->from(TABLE_BUILD)->where('id')->in(array_unique($buildIdList))->fetchAll('id');
+        foreach($releases as $release)
+        {
+            foreach(explode(',', $release->build) as $buildID)
+            {
+                if(empty($buildID)) continue;
+                $release->buildInfos[$buildID] = $builds[$buildID];
+            }
+        }
+        return $releases;
     }
 
     /**
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 9764482095..7686b8a08e 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -65,11 +65,10 @@
     <tbody>
       <?php foreach($releases as $release):?>
       <?php
-      $linkedBuilds = explode(',', trim($release->build, ','));
-      $buildCount   = count($linkedBuilds);
-      foreach($linkedBuilds as $i => $buildID):
+      $i = 0;
+      $buildCount = count($release->buildInfos);
+      foreach($release->buildInfos as $buildID => $build):
       ?>
-      <?php $buildName = zget($builds, $buildID, '');?>
       <?php if($i == 0):?>
       <?php $rowspan = $buildCount > 1 ? "rowspan='$buildCount'" : '';?>
       <tr data-type='<?php echo $release->status;?>'>
@@ -83,7 +82,7 @@
         <?php if($project->hasProduct):?>
         <td <?php echo $rowspan?> title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
         <?php endif;?>
-        <td class='c-build' title='<?php echo $buildName;?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$buildID"), $buildName, '', "data-app='project'");?></td>
+        <td class='c-build' title='<?php echo $build->name;?>'><?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project'");?></td>
         <?php $status = $this->processStatus('release', $release);?>
         <td <?php echo $rowspan?> class='c-status text-center' title='<?php echo $status;?>'>
           <span class="status-release status-<?php echo $release->status?>"><?php echo $status;?></span>
@@ -94,9 +93,10 @@
       </tr>
       <?php else:?>
       <tr>
-        <td class='c-build' title='<?php echo $buildName;?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$buildID"), $buildName, '', "data-app='project'");?></td>
+        <td class='c-build' title='<?php echo $build->name;?>'><?php echo html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project'");?></td>
       </tr>
       <?php endif;?>
+      <?php $i++; ?>
       <?php endforeach;?>
       <?php endforeach;?>
     </tbody>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 23b8bdf03c..a2095e0c51 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -356,7 +356,7 @@
                         $buildHtml = array();
                         foreach($release->buildInfos as $buildID => $buildInfo)
                         {
-                            $buildHtml[] = html::a($this->createLink('build', 'view', "buildID=$buildID"), $buildInfo->name);
+                            $buildHtml[] = html::a($this->createLink($buildInfo->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $buildInfo->name, '', "data-app='project'");
                         }
                         echo join(', ', $buildHtml);
                         ?>

From 7da90a3b7b8d14822d0234cb4bc39cb32cfc5c78 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:12:11 +0800
Subject: [PATCH 19/60] * Finish task #76106.

---
 module/project/lang/de.php    |  10 +-
 module/project/lang/en.php    |  10 +-
 module/project/lang/fr.php    |  10 +-
 module/project/lang/vi.php    | 339 +++++++++++++++++++++++-----------
 module/project/lang/zh-cn.php |  10 +-
 5 files changed, 251 insertions(+), 128 deletions(-)

diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index bd13cedc2e..b7bef1cb44 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -134,7 +134,7 @@ $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';
 $lang->project->realBegan          = 'Actual Began';
 $lang->project->realEnd            = 'Actual End';
-$lang->project->division           = 'Create Stages by Product';
+$lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
@@ -190,8 +190,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['1'] = 'Enable';
-$lang->project->divisionList['0'] = 'Disable';
+$lang->project->divisionList['1'] = 'Create by project';
+$lang->project->divisionList['0'] = 'Create by product';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
@@ -208,7 +208,7 @@ $lang->project->changeProgram          = '%s > Change project';
 $lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
 $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is associated with multiple products, you can click Confirm to open the mode by {$lang->productCommon} creation stage, click Cancel to keep the status quo.";
+$lang->project->noticeDivsion          = "The current project is a single stage, click [Create by project] to change to multiple stages, each stage is only associated with one product.";
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
@@ -358,7 +358,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
+$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7024b40b3e..fc890c98cb 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -134,7 +134,7 @@ $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';
 $lang->project->realBegan          = 'Actual Begin';
 $lang->project->realEnd            = 'Actual End';
-$lang->project->division           = 'Create Stages by Product';
+$lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
@@ -190,8 +190,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['1'] = 'Enable';
-$lang->project->divisionList['0'] = 'Disable';
+$lang->project->divisionList['1'] = 'Create by project';
+$lang->project->divisionList['0'] = 'Create by product';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
@@ -208,7 +208,7 @@ $lang->project->changeProgram          = '%s > Change project';
 $lang->project->changeProgramTip       = 'Once the program is edited, the product that is linked to this program will be changed. Do you want to edit it?';
 $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is associated with multiple products, you can click Confirm to open the mode by {$lang->productCommon} creation stage, click Cancel to keep the status quo.";
+$lang->project->noticeDivsion          = "The current project is a single stage, click [Create by project] to change to multiple stages, each stage is only associated with one product.";
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
@@ -365,7 +365,7 @@ $lang->project->begigLetterExecution = 'The start date of project should be ≤
 $lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
 $lang->project->childLongTime        = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
+$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 4bd82436cd..2039c47420 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -134,7 +134,7 @@ $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';
 $lang->project->realBegan          = 'Actual Began';
 $lang->project->realEnd            = 'Actual End';
-$lang->project->division           = 'Create Stages by Product';
+$lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
@@ -190,8 +190,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = 'Projects Ownedbyme';
 $lang->project->typeList['other'] = 'Other Projects';
 
-$lang->project->divisionList['1'] = 'Enable';
-$lang->project->divisionList['0'] = 'Disable';
+$lang->project->divisionList['1'] = 'Create by project';
+$lang->project->divisionList['0'] = 'Create by product';
 
 $lang->project->waitProjects    = 'Waiting Projects';
 $lang->project->doingProjects   = 'Ongoing Projects';
@@ -208,7 +208,7 @@ $lang->project->changeProgram          = '%s > Change project';
 $lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
 $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is associated with multiple products, you can click Confirm to open the mode by {$lang->productCommon} creation stage, click Cancel to keep the status quo.";
+$lang->project->noticeDivsion          = "The current project is a single stage, click [Create by project] to change to multiple stages, each stage is only associated with one product.";
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
@@ -365,7 +365,7 @@ $lang->project->begigLetterExecution = 'La date de début du projet "%s" doit ê
 $lang->project->endGreateExecution   = 'La date de fin du projet "%s" doit être ≥ à la date de fin maximale d\'exécution: %s.';
 $lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
+$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 1996af20a1..fc890c98cb 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -1,85 +1,140 @@
 <?php
 /* Actions. */
-$lang->project->createGuide       = 'Select Template';
-$lang->project->index             = 'Dashboard';
-$lang->project->home              = 'Home';
-$lang->project->create            = 'Create Project';
-$lang->project->edit              = 'Edit';
-$lang->project->batchEdit         = 'Batch Edit Projects';
-$lang->project->view              = 'Project View';
-$lang->project->batchEdit         = 'Batch Edit';
-$lang->project->browse            = 'Projects';
-$lang->project->all               = 'All';
-$lang->project->start             = 'Start';
-$lang->project->finish            = 'Finish';
-$lang->project->suspend           = 'Suspend';
-$lang->project->delete            = 'Delete';
-$lang->project->close             = 'Close';
-$lang->project->activate          = 'Activate';
-$lang->project->group             = 'Privilege Group';
-$lang->project->createGroup       = 'Create Group';
-$lang->project->editGroup         = 'Edit Group';
-$lang->project->copyGroup         = 'Copy Group';
-$lang->project->manageView        = 'Manage View';
-$lang->project->managePriv        = 'Manage Privilege';
-$lang->project->manageMembers     = 'Manage Team';
-$lang->project->export            = 'Export';
-$lang->project->addProduct        = 'Add Product';
-$lang->project->manageGroupMember = 'Manage Group';
-$lang->project->moduleSetting     = 'List Settings';
-$lang->project->moduleOpen        = 'Program Name';
-$lang->project->dynamic           = 'Dynamic';
-$lang->project->execution         = 'Execution';
-$lang->project->qa                = 'QA';
-$lang->project->bug               = 'Bug List';
-$lang->project->testcase          = 'Case List';
-$lang->project->testtask          = 'Test Task';
-$lang->project->build             = 'Build';
-$lang->project->updateOrder       = 'Order';
-$lang->project->sort              = 'Order';
-$lang->project->whitelist         = 'Project Whitelist';
-$lang->project->addWhitelist      = 'Project Add Whitelist';
-$lang->project->unbindWhitelist   = 'Project Remove Whitelist';
-$lang->project->manageProducts    = 'Manage Products';
-$lang->project->copyTitle         = 'Please select an project to copy';
-$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
-$lang->project->errorNoProducts   = 'At least one product is associated';
-$lang->project->copyNoProject     = 'There are no items available to copy.';
-$lang->project->searchByName      = 'Enter the project name to retrieve';
-$lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
-$lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
-$lang->project->testreport        = 'Testreport';
-$lang->project->selectProgram     = 'Program filtering';
-$lang->project->teamMember        = 'Team Member';
-$lang->project->manageRepo        = 'Manage Repo';
-$lang->project->linkedRepo        = 'Link Repo';
-$lang->project->unlinkedRepo      = 'Unlink Repo';
+$lang->project->createGuide         = 'Select Template';
+$lang->project->index               = 'Dashboard';
+$lang->project->home                = 'Home';
+$lang->project->create              = 'Create Project';
+$lang->project->edit                = 'Edit';
+$lang->project->batchEdit           = 'Batch Edit Projects';
+$lang->project->view                = 'Project View';
+$lang->project->batchEdit           = 'Batch Edit';
+$lang->project->browse              = 'Projects';
+$lang->project->all                 = 'All';
+$lang->project->start               = 'Start';
+$lang->project->finish              = 'Finish';
+$lang->project->suspend             = 'Suspend';
+$lang->project->delete              = 'Delete';
+$lang->project->close               = 'Close';
+$lang->project->activate            = 'Activate';
+$lang->project->group               = 'Privilege Group';
+$lang->project->createGroup         = 'Create Group';
+$lang->project->editGroup           = 'Edit Group';
+$lang->project->copyGroup           = 'Copy Group';
+$lang->project->manageView          = 'Manage View';
+$lang->project->managePriv          = 'Manage Privilege';
+$lang->project->manageMembers       = 'Manage Team';
+$lang->project->export              = 'Export';
+$lang->project->addProduct          = 'Add Product';
+$lang->project->manageGroupMember   = 'Manage Group';
+$lang->project->moduleSetting       = 'List Settings';
+$lang->project->moduleOpen          = 'Program Name';
+$lang->project->dynamic             = 'Dynamic';
+$lang->project->execution           = 'Execution';
+$lang->project->qa                  = 'QA';
+$lang->project->bug                 = 'Bug List';
+$lang->project->testcase            = 'Case List';
+$lang->project->testtask            = 'Test Task';
+$lang->project->build               = 'Build';
+$lang->project->updateOrder         = 'Order';
+$lang->project->sort                = 'Order';
+$lang->project->whitelist           = 'Project Whitelist';
+$lang->project->addWhitelist        = 'Project Add Whitelist';
+$lang->project->unbindWhitelist     = 'Project Remove Whitelist';
+$lang->project->manageProducts      = 'Manage Products';
+$lang->project->manageOtherProducts = 'Manage Other Products';
+$lang->project->copyTitle           = 'Please select an project to copy';
+$lang->project->errorSameProducts   = 'Project cannot be associated with multiple identical products.';
+$lang->project->errorSameBranches   = 'Project cannot be associated with multiple identical branches.';
+$lang->project->errorSamePlans      = 'Project cannot be associated with multiple identical plans.';
+$lang->project->errorNoProducts     = 'At least one product is associated';
+$lang->project->copyNoProject       = 'There are no items available to copy.';
+$lang->project->searchByName        = 'Enter the project name to retrieve';
+$lang->project->deleted             = 'Deleted';
+$lang->project->linkedProducts      = "Linked {$lang->productCommon}s";
+$lang->project->unlinkedProducts    = "Unlinked {$lang->productCommon}s";
+$lang->project->testreport          = 'Test Report';
+$lang->project->selectProgram       = 'Program filtering';
+$lang->project->teamMember          = 'Team Member';
+$lang->project->unlinkMember        = 'Remove Member';
+$lang->project->copyTeamTitle       = 'Select a project team to copy';
+$lang->project->daysGreaterProject  = 'Days cannot be greater than days of project『%s』';
+$lang->project->errorHours          = 'Hours/Day cannot be greater than『24』';
+$lang->project->workdaysExceed      = 'No more than『%s』working days';
+$lang->project->teamMembersCount    = ', there are %s team members.';
+$lang->project->budgetNumber        = '『Budget』must be numbers.';
+$lang->project->budgetGe0           = '『Budget』must be greater than or equal to 0.';
+$lang->project->allProjects         = 'All Projects';
+$lang->project->ignore              = 'Ignore';
+$lang->project->manageRepo          = 'Manage Repo';
+$lang->project->linkedRepo          = 'Link Repo';
+$lang->project->unlinkedRepo        = 'Unlink Repo';
+$lang->project->disableExecution    = 'Project of disable iteration';
+$lang->project->selectProduct       = 'Select Product';
 
 /* Fields. */
 $lang->project->common             = 'Project';
+$lang->project->id                 = 'ID';
+$lang->project->project            = 'Project';
 $lang->project->stage              = 'Stage';
+$lang->project->model              = 'Model';
 $lang->project->PM                 = 'Manager';
+$lang->project->PO                 = 'Project Owner';
+$lang->project->QD                 = 'Test Leader';
+$lang->project->RD                 = 'Releaser';
 $lang->project->name               = 'Name';
 $lang->project->category           = 'Category';
 $lang->project->desc               = 'Description';
 $lang->project->code               = 'Code';
 $lang->project->hasProduct         = 'Has Product';
 $lang->project->copy               = 'Copy';
-$lang->project->begin              = 'Begin';
-$lang->project->end                = 'End';
+$lang->project->begin              = 'Planned Begin';
+$lang->project->end                = 'Planned End';
 $lang->project->status             = 'Status';
-$lang->project->PM                 = 'Manager';
+$lang->project->subStatus          = 'Sub Status';
+$lang->project->type               = 'Type';
+$lang->project->lifetime           = 'Project Cycle';
+$lang->project->attribute          = 'Stage Type';
+$lang->project->percent            = 'Workload %';
+$lang->project->milestone          = 'Milestone';
+$lang->project->output             = 'Output';
+$lang->project->path               = 'Path';
+$lang->project->grade              = 'Grade';
+$lang->project->version            = 'Version';
+$lang->project->parentVersion      = 'Parent Version';
+$lang->project->planDuration       = 'Plan Duration';
+$lang->project->realDuration       = 'Real Duration';
+$lang->project->openedVersion      = 'Opened Version';
+$lang->project->pri                = 'Priority';
+$lang->project->openedBy           = 'OpenedBy';
+$lang->project->openedDate         = 'OpenedDate';
+$lang->project->lastEditedBy       = 'Last EditedBy';
+$lang->project->lastEditedDate     = 'Last EditedDate';
+$lang->project->closedBy           = 'ClosedBy';
+$lang->project->closedDate         = 'ClosedDate';
+$lang->project->canceledBy         = 'CanceledBy';
+$lang->project->canceledDate       = 'CanceledDate';
+$lang->project->team               = 'Team';
+$lang->project->teamAction         = 'Team List';
+$lang->project->order              = 'Rank';
 $lang->project->budget             = 'Budget';
+$lang->project->budgetUnit         = 'Budget Unit';
+$lang->project->suspendedDate      = 'SuspendedDate';
+$lang->project->vision             = 'Vision';
+$lang->project->displayCards       = 'Max cards per column';
+$lang->project->fluidBoard         = 'Column Width';
 $lang->project->template           = 'Template';
 $lang->project->estimate           = 'Estimates';
 $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
-$lang->project->dateRange          = 'Duration';
+$lang->project->weekProgress       = 'This Week Progress';
+$lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
+$lang->project->realBeganAB        = 'Actual Begin';
+$lang->project->realEndAB          = 'Actual End';
+$lang->project->realBegan          = 'Actual Begin';
 $lang->project->realEnd            = 'Actual End';
-$lang->project->realBegan          = 'Actual Began';
-$lang->project->division           = 'Create Stages by Product';
+$lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
@@ -90,14 +145,12 @@ $lang->project->acl                = 'ACL';
 $lang->project->setPlanduration    = 'Set Duration';
 $lang->project->auth               = 'Privileges';
 $lang->project->durationEstimation = 'Estimated Workload';
-$lang->project->teamCount          = 'Man';
-$lang->project->teamSumCount       = '%s people in total';
 $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
 $lang->project->leftHours          = 'Left Hours';
 $lang->project->children           = 'Child Project';
-$lang->project->parent             = 'Parent Project';
+$lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
 $lang->project->doneStories        = 'Finished Stories';
 $lang->project->doneProjects       = 'Finished';
@@ -108,48 +161,89 @@ $lang->project->ev                 = 'EV';
 $lang->project->sv                 = 'SV%';
 $lang->project->ac                 = 'AC';
 $lang->project->cv                 = 'CV%';
+$lang->project->pvTitle            = 'Planed Value';
+$lang->project->evTitle            = 'Earn Value';
+$lang->project->svTitle            = 'Schedule Variance';
+$lang->project->acTitle            = 'Actual Cost';
+$lang->project->cvTitle            = 'Cost Variance';
 $lang->project->teamCount          = 'Team';
+$lang->project->teamSumCount       = '%s people in total';
 $lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
-$lang->project->days               = 'Available Days';
+$lang->project->days               = 'Days';
+$lang->project->mailto             = 'Mailto';
+$lang->project->etc                = " , etc";
+$lang->project->product            = 'Product';
+$lang->project->branch             = 'Branch';
+$lang->project->plan               = 'Plan';
+$lang->project->createKanban       = 'Create Kanban';
+$lang->project->kanban             = 'Kanban';
 
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
 $lang->project->projectTypeList[1] = 'Has Product';
 $lang->project->projectTypeList[0] = 'No Product';
 
+/* Project Kanban. */
+$lang->project->typeList = array();
+$lang->project->typeList['my']    = 'Projects Ownedbyme';
+$lang->project->typeList['other'] = 'Other Projects';
+
+$lang->project->divisionList['1'] = 'Create by project';
+$lang->project->divisionList['0'] = 'Create by product';
+
+$lang->project->waitProjects    = 'Waiting Projects';
+$lang->project->doingProjects   = 'Ongoing Projects';
+$lang->project->doingExecutions = 'Ongoing Executions';
+$lang->project->closedProjects  = 'Closed Projects(The recent two projects)';
+$lang->project->closedProject   = 'Closed Projects';
+$lang->project->noProgram       = 'Independent Projects';
+
+$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
+
 $lang->project->productNotEmpty        = 'Please link products or create products.';
 $lang->project->existProductName       = 'Product name already exists.';
 $lang->project->changeProgram          = '%s > Change project';
-$lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
+$lang->project->changeProgramTip       = 'Once the program is edited, the product that is linked to this program will be changed. Do you want to edit it?';
 $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is associated with multiple products, you can click Confirm to open the mode by {$lang->productCommon} creation stage, click Cancel to keep the status quo.";
+$lang->project->noticeDivsion          = "The current project is a single stage, click [Create by project] to change to multiple stages, each stage is only associated with one product.";
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
+$lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
+$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
+$lang->project->productTip             = 'After clicking New Product, the project will not be linked to the selected product.';
 $lang->project->noDevStage             = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.';
+$lang->project->budgetOverrun          = "The project's budget exceeds the remaining budget of the parent program:";
+$lang->project->disabledInputTip       = 'Please cancel %s first';
 $lang->project->linkRepoFailed         = 'Failed to link projects and code repositories.';
+$lang->project->unLinkProductTip       = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
+$lang->project->summary                = 'Total projects: <strong>%s</strong>.';
+$lang->project->allSummary             = 'Total projects: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.';
+$lang->project->checkedSummary         = 'Seleted: <strong>%total%</strong>.';
+$lang->project->checkedAllSummary      = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>, Suspended: <strong>%suspended%</strong>, Closed: <strong>%closed%</strong>.';
 
-$lang->project->tenThousand = '';
+$lang->project->tenThousand    = 'Ten Thousand';
+$lang->project->hundredMillion = 'Hundred Million';
 
 $lang->project->unitList['CNY'] = 'RMB';
 $lang->project->unitList['USD'] = 'USD';
 $lang->project->unitList['HKD'] = 'HKD';
-$lang->project->unitList['NTD'] = 'New Taiwan';
-$lang->project->unitList['EUR'] = 'Euro';
-$lang->project->unitList['DEM'] = 'Deutsche Mark';
-$lang->project->unitList['CHF'] = 'Swiss Franc';
-$lang->project->unitList['FRF'] = 'French Franc';
-$lang->project->unitList['GBP'] = 'Pound';
-$lang->project->unitList['NLG'] = 'Florin';
-$lang->project->unitList['CAD'] = 'Canadian';
-$lang->project->unitList['RUR'] = 'Russian Ruble';
-$lang->project->unitList['INR'] = 'Indian';
-$lang->project->unitList['AUD'] = 'Australian';
-$lang->project->unitList['NZD'] = 'New Zealand';
-$lang->project->unitList['THB'] = 'Thai Baht';
-$lang->project->unitList['SGD'] = 'Singapore';
+$lang->project->unitList['NTD'] = 'NTD';
+$lang->project->unitList['EUR'] = 'EUR';
+$lang->project->unitList['DEM'] = 'DEM';
+$lang->project->unitList['CHF'] = 'CHF';
+$lang->project->unitList['FRF'] = 'FRF';
+$lang->project->unitList['GBP'] = 'GPR';
+$lang->project->unitList['NLG'] = 'NLG';
+$lang->project->unitList['CAD'] = 'CAD';
+$lang->project->unitList['RUR'] = 'RUB';
+$lang->project->unitList['INR'] = 'IDR';
+$lang->project->unitList['AUD'] = 'AUD';
+$lang->project->unitList['NZD'] = 'NZD';
+$lang->project->unitList['THB'] = 'THB';
+$lang->project->unitList['SGD'] = 'SGD';
 
 $lang->project->currencySymbol['CNY'] = '¥';
 $lang->project->currencySymbol['USD'] = '$';
@@ -169,34 +263,56 @@ $lang->project->currencySymbol['NZD'] = 'NZ$';
 $lang->project->currencySymbol['THB'] = '฿';
 $lang->project->currencySymbol['SGD'] = 'S$';
 
+$lang->project->modelList['']          = '';
 $lang->project->modelList['scrum']     = "Scrum";
-$lang->project->modelList['waterfall'] = "CMMI";
+if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI";
+$lang->project->modelList['kanban']    = "Kanban";
 
 $lang->project->featureBar['browse']['all']       = 'All';
-$lang->project->featureBar['browse']['doing']     = 'Doing';
+$lang->project->featureBar['browse']['undone']    = 'Unfinished';
 $lang->project->featureBar['browse']['wait']      = 'Waiting';
+$lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
 $lang->project->featureBar['build']['all'] = 'Build List';
 
-$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
+$lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
 
+$lang->project->multipleList['1'] = 'Yes';
+$lang->project->multipleList['0'] = 'No';
+
 $lang->project->acls['private'] = 'Private';
-$lang->project->acls['open']    = "Open";
+$lang->project->acls['open']    = 'Open';
 
 $lang->project->subAclList['private'] = "Private (Only the project leader, team members and stakeholders can access)";
 $lang->project->subAclList['open']    = "Open (accessible with project view permissions)";
 $lang->project->subAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members and stakeholders can access)';
 
+$lang->project->kanbanAclList['private'] = 'Private (For the project leader, team members only)';
+$lang->project->kanbanAclList['open']    = "Open (accessible with project view permissions)";
+
+$lang->project->kanbanSubAclList['private'] = "Private (Only the project leader, team members can access)";
+$lang->project->kanbanSubAclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
+
+global $config;
+if($config->systemMode == 'light')
+{
+    unset($lang->project->subAclList['program']);
+    unset($lang->project->kanbanSubAclList['program']);
+}
+
 $lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)';
 $lang->project->authList['reset']  = 'Reset (project privilege only)';
 
+$lang->project->statusList['']          = '';
 $lang->project->statusList['wait']      = 'Waiting';
 $lang->project->statusList['doing']     = 'Doing';
 $lang->project->statusList['suspended'] = 'Suspended';
 $lang->project->statusList['closed']    = 'Closed';
+$lang->project->statusList['delay']     = 'Delayed';
 
 $lang->project->endList[31]  = 'One month';
 $lang->project->endList[93]  = 'Trimester';
@@ -204,47 +320,54 @@ $lang->project->endList[186] = 'Half year';
 $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
+$lang->project->scrumTitle     = 'Agile Development Management';
+$lang->project->waterfallTitle = 'Waterfall Project Management';
+$lang->project->kanbanTitle    = 'Kanban Project Management';
+
 $lang->project->empty                  = 'No project.';
-$lang->project->accessDenied           = 'Access denied!';
-$lang->project->chooseProgramType      = 'Select the project management model';
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
 $lang->project->lastIteration          = "Recent {$lang->executionCommon}";
+$lang->project->lastKanban             = 'Recent Kanban';
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
-$lang->project->waterfall              = 'CMMI';
-$lang->project->waterfallTitle         = 'CMMI';
+$lang->project->waterfall              = 'Waterfall';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
-$lang->project->confirmDelete          = "Do you want to delete [%s]?";
 $lang->project->emptyPM                = 'No manager';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
 $lang->project->cannotCancelCat        = "It has child projects, so you cannot unmark the parent.";
 $lang->project->parentBeginEnd         = "Parent begin&end date: %s ~ %s";
 $lang->project->childLongTime          = "If a child as long-term projects, the parent should be long-term too.";
 $lang->project->readjustTime           = 'Change the project begin&end date.';
-$lang->project->notAllowRemoveProducts = 'The story of this product is linked with the project. Unlink it before doing any action.';
+$lang->project->notAllowRemoveProducts = "Stories of this product are linked to projects or {$lang->execution->common} of this project is linked to this product. Please unlink it and try again.";
+$lang->project->ge                     = "『%s』should be >= actual begin『%s』.";
 
-$lang->project->programTitle['0']    = 'Hide';
+$lang->project->programTitle['0']    = 'Hidden';
 $lang->project->programTitle['base'] = 'Base-level project only';
 $lang->project->programTitle['end']  = 'End-level project only';
 
-$lang->project->accessDenied      = 'Access denied to this project';
-$lang->project->chooseProgramType = 'Select management type';
-$lang->project->scrumTitle        = 'Agile Development Management';
-$lang->project->cannotCreateChild = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.';
-$lang->project->hasChildren       = 'This project has a child project, so it cannot be deleted.';
-$lang->project->confirmDelete     = 'Do you want to delete this project?';
-$lang->project->cannotChangeToCat = "The project has contents, so you cannot it to a parent project.";
-$lang->project->cannotCancelCat   = "There are child projects of this project. You cannot cancel the parent project mark.";
-$lang->project->parentBeginEnd    = "The begin and end date of the parent project: %s ~ %s";
-$lang->project->parentBudget      = "The budget of the parent project: ";
-$lang->project->beginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project.";
-$lang->project->endGreaterParent  = "The end date of the parent project: %s. It cannot be > the end date of its parent project.";
-$lang->project->beginGreateChild  = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the project set.";
-$lang->project->endLetterChild    = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the project set.";
-$lang->project->childLongTime     = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
-$lang->project->divisionTips      = "The current project is a single set stage, click [Enable] to change to multiple sets of stages, each set of stages is only associated with one product.";
+$lang->project->accessDenied         = 'Access denied to this project';
+$lang->project->chooseProgramType    = 'Select management type';
+$lang->project->cannotCreateChild    = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.';
+$lang->project->hasChildren          = 'This project has a child project, so it cannot be deleted.';
+$lang->project->confirmDelete        = 'Do you want to delete \"%s\"?';
+$lang->project->cannotChangeToCat    = "The project has contents, so you cannot it to a parent project.";
+$lang->project->cannotCancelCat      = "There are child projects of this project. You cannot cancel the parent project mark.";
+$lang->project->parentBeginEnd       = "The begin and end date of the parent project: %s ~ %s";
+$lang->project->parentBudget         = "The budget of the parent program: ";
+$lang->project->beginLetterParent    = "The start date of the project is < the start date of the parent program:";
+$lang->project->endGreaterParent     = "The finish date of the project is > the finish date of the parent program:";
+$lang->project->dateExceedParent     = "The start and finish date of the project was > the start and finish date of the parent program:";
+$lang->project->beginGreateChild     = 'The start date of the project should be ≥ the start date of program: %s.';
+$lang->project->endLetterChild       = 'The finish date of the project should be ≤ the finish date of program: %s.';
+$lang->project->begigLetterExecution = 'The start date of project should be ≤ the minimum start date of the execution: %s.';
+$lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
+$lang->project->childLongTime        = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
+$lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
+$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
+
+$lang->project->multiple = "Multi {$lang->executionCommon}";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index edad53d25b..15b35b67f5 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -134,7 +134,7 @@ $lang->project->realBeganAB        = '实际开始';
 $lang->project->realEndAB          = '实际完成';
 $lang->project->realBegan          = '实际开始日期';
 $lang->project->realEnd            = '实际完成日期';
-$lang->project->division           = '按产品创建阶段';
+$lang->project->division           = '阶段类型';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
 $lang->project->bycard             = '卡片';
@@ -190,8 +190,8 @@ $lang->project->typeList = array();
 $lang->project->typeList['my']    = '我负责的项目';
 $lang->project->typeList['other'] = '其他项目';
 
-$lang->project->divisionList['1'] = '开启';
-$lang->project->divisionList['0'] = '关闭';
+$lang->project->divisionList['0'] = '按项目创建';
+$lang->project->divisionList['1'] = "按{$lang->productCommon}创建";
 
 $lang->project->waitProjects    = '未开始的项目';
 $lang->project->doingProjects   = '进行中的项目';
@@ -208,7 +208,7 @@ $lang->project->changeProgram          = '%s > 修改项目集';
 $lang->project->changeProgramTip       = '修改项目集后，该项目关联产品的项目集也会被修改，请确认是否修改。';
 $lang->project->linkedProjectsTip      = '关联的项目如下';
 $lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
-$lang->project->noticeDivsion          = '当前项目关联多个产品，可以点击确认开启按产品创建阶段的模式，点击关闭则保持现状。';
+$lang->project->noticeDivsion          = "当前项目为单套阶段，点击[按项目创建]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
 $lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
 $lang->project->createExecution        = "该项目下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
 $lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->execution->common}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
@@ -365,7 +365,7 @@ $lang->project->begigLetterExecution = '项目的开始日期应小于等于执
 $lang->project->endGreateExecution   = '项目的完成日期应大于等于执行的最大完成日期：%s';
 $lang->project->childLongTime        = "子项目中有长期项目，父项目也应该是长期项目";
 $lang->project->confirmUnlinkMember  = "您确定从该项目中移除该用户吗？";
-$lang->project->divisionTips         = "当前项目为单套阶段，点击[开启]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
+$lang->project->divisionTips         = "按项目创建为单套阶段，阶段关联所有{$lang->productCommon}；按{$lang->productCommon}创建为多套阶段，每套阶段关联一个{$lang->productCommon}。";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";

From 24bff3993c3de5735c775b5d0dd2c0185206782f Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 01:44:12 +0000
Subject: [PATCH 20/60]  * Fix bug #29747.

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

diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 67054a46e2..3b60363ba9 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -357,7 +357,7 @@
                         foreach($release->builds as $build)
                         {
                             $buildDivision = $i == count($release->builds) ? '' : $lang->comma;
-                            echo (($build->project) ? html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name, '_blank') : $build->name) . $buildDivision;
+                            echo (($build->project) ? html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name) : $build->name) . $buildDivision;
                             $i++;
                         }
                         ?>

From f86b9b0b17a99f9ad01c42f0642eac46813ac83b Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:51:31 +0800
Subject: [PATCH 21/60] * Fix bug#29440.

---
 module/common/lang/menu.php              | 2 +-
 module/execution/lang/de.php             | 1 +
 module/execution/lang/en.php             | 1 +
 module/execution/lang/fr.php             | 1 +
 module/execution/lang/vi.php             | 1 +
 module/execution/lang/zh-cn.php          | 1 +
 module/execution/view/linkstory.html.php | 3 ++-
 module/execution/view/story.html.php     | 2 +-
 8 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index de9280d5d1..d5c3142d9a 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -343,7 +343,7 @@ $lang->execution->menu->view   = array('link' => "$lang->view|execution|grouptas
 if($config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
 
 $lang->execution->menu->storyGroup = array('link' => "{$lang->common->story}|execution|story|executionID=%s",'class' => 'dropdown dropdown-hover', 'subModule' => 'story', 'alias' => 'batchcreate,storykanban');
-$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'storykanban');
+$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'storykanban,linkstory');
 $lang->execution->menu->qa         = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc        = array('link' => "{$lang->doc->common}|doc|tableContents|type=execution&objectID=%s", 'subModule' => 'doc');
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 29c7ef95cb..ee29d08f90 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -345,6 +345,7 @@ $lang->execution->wbs                  = "Aufgaben aufteilen";
 $lang->execution->batchWBS             = "Mehrere aufteilen";
 $lang->execution->howToUpdateBurn      = "<a href='http://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='Wie wird der Burndown Chart aktualisiert?' class='btn btn-link'>Hilfe <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->executionCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
 $lang->execution->productStories       = "{$lang->executionCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte <a href='%s'> Story verknüpfen</a>。";
 $lang->execution->haveDraft            = "There are %s draft stories can't be linked.";
 $lang->execution->doneExecutions       = 'Erledigt';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 5c7d8daf50..276311554f 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -345,6 +345,7 @@ $lang->execution->wbs                  = "Create Task";
 $lang->execution->batchWBS             = "Batch Create Tasks";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
 $lang->execution->productStories       = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Stories</a> now.";
 $lang->execution->haveDraft            = "%s stories in draft, so they can't be linked.";
 $lang->execution->doneExecutions       = 'Finished';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 3da5b42ffa..40c1dd6f2f 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -345,6 +345,7 @@ $lang->execution->wbs                  = "Créer Tâche";
 $lang->execution->batchWBS             = "Créer Tâche en lot";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Comment mettre à jour le Graphe d´atterrissage ?' class='btn btn-link'>Mise à jour <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
 $lang->execution->productStories       = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. <a href='%s'> Associer Stories</a> maintenant.";
 $lang->execution->haveDraft            = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement.";
 $lang->execution->doneExecutions       = 'Terminé';
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index 9d3885c16a..bd77c671f5 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -281,6 +281,7 @@ $lang->execution->wbs                 = "Tạo nhiệm vụ";
 $lang->execution->batchWBS            = "Tạo nhiệm vụ hàng loạt";
 $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Làm thế nào để cập nhật biểu đồ Burndown?' class='btn btn-link'>Giúp<i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories        = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->executionCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
+$lang->execution->projectNoStories    = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
 $lang->execution->productStories      = "Câu chuyện liên kết tới {$lang->executionCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. <a href='%s'> Liên kết câu chuyện</a> now.";
 $lang->execution->haveDraft           = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết.";
 $lang->execution->doneExecutions      = 'Kết thúc';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 77f79dff1f..a11a6923d4 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -345,6 +345,7 @@ $lang->execution->wbs                  = "分解任务";
 $lang->execution->batchWBS             = "批量分解";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
+$lang->execution->projectNoStories     = "看起来没有{$lang->SRCommon}可以关联。请检查下项目中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->productStories       = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
 $lang->execution->haveDraft            = "有%s条草稿状态的{$lang->SRCommon}无法关联到该执行";
 $lang->execution->doneExecutions       = '已结束';
diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index dccd6cc427..05e7db5875 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -105,7 +105,8 @@
     </div>
     <?php else:?>
     <div class="table-empty-tip">
-      <p><span class="text-muted"><?php echo $lang->{$app->rawModule}->whyNoStories;?></p>
+      <?php $emptyTips = ($app->rawModule == 'execution' and !$project->hasProduct) ? 'projectNoStories' : 'whyNoStories';?>
+      <p><span class="text-muted"><?php echo $lang->{$app->rawModule}->{$emptyTips};?></p>
     </div>
     <?php endif;?>
   </form>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 4d4d80de04..1e217d8434 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -81,7 +81,7 @@
     if($productID) common::printIcon('story', 'report', "productID=$productID&branchID=&storyType=$storyType&browseType=$type&moduleID=$param&chartType=pie&projectID=$execution->id", '', 'button', 'bar-chart muted');
     common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe'");
 
-    $canLinkStory = $execution->hasProduct or $execution->multiple;
+    $canLinkStory = $execution->multiple;
     if(common::canModify('execution', $execution))
     {
         $this->lang->story->create = $this->lang->execution->createStory;

From 9cc5139a080c19e76594012b1b3ff54d041c5427 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 09:53:24 +0800
Subject: [PATCH 22/60] * finish task #75919

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 4d4d80de04..37efbfad94 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -253,6 +253,7 @@
           foreach($setting as $key => $value)
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               if($value->show)
               {
                   $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
@@ -271,6 +272,7 @@
           <?php foreach($setting as $key => $value)
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               $this->story->printCell($value, $story, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType, $execution, $showBranch);
           }
           ?>
@@ -285,6 +287,7 @@
           <?php foreach($setting as $key => $value)
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
               $this->story->printCell($value, $child, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType, $execution);
           }?>
           </tr>

From 236ae00f189dff22cbdfd6024bc2bd1c79a8fd45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 10:00:46 +0800
Subject: [PATCH 23/60]  * fix bug #29740.

---
 module/projectrelease/control.php          | 3 +--
 module/projectrelease/view/create.html.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index f2d8398c9b..2771cb306c 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -372,7 +372,7 @@ class projectrelease extends control
             $builds  = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id');
             foreach($builds as $build)
             {
-                if(empty($build->execution)) $this->build->delete(TABLE_BUILD, $build->id);
+                if(empty($build->execution) and empty($build->builds) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id);
             }
 
             $message = $this->executeHooks($releaseID);
@@ -390,7 +390,6 @@ class projectrelease extends control
                 {
                     $response['result']  = 'success';
                     $response['message'] = '';
-                    $this->dao->update(TABLE_BUILD)->set('deleted')->eq(1)->where('id')->in($release->build)->andWhere('name')->eq($release->name)->exec();
                 }
                 return $this->send($response);
             }
diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php
index ea809f9afe..a17fe99ce5 100644
--- a/module/projectrelease/view/create.html.php
+++ b/module/projectrelease/view/create.html.php
@@ -38,7 +38,7 @@
             <td>
               <div class='input-group'>
               <?php echo html::select('product', $products, $product->id, "onchange='loadBranches(this.value)' class='form-control chosen'");?>
-              <?php if($product->type != 'normal') echo html::select('branch', $branches, $branch, "class='form-control chosen control-branch'");?>
+              <?php if($product->type != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBuilds()' class='form-control chosen control-branch'");?>
               </div>
             </td>
             <td></td>

From d7f9d55863d8260a5b350cc759621739f8849318 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Tue, 15 Nov 2022 02:15:12 +0000
Subject: [PATCH 24/60] * Resolved feedback #1422.

---
 module/branch/model.php      | 2 +-
 module/bug/model.php         | 2 +-
 module/execution/control.php | 4 ++--
 module/project/control.php   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/branch/model.php b/module/branch/model.php
index dbf7fac873..47bbc4f4ed 100644
--- a/module/branch/model.php
+++ b/module/branch/model.php
@@ -126,7 +126,7 @@ class branchModel extends model
 
         if($executionID)
         {
-            if(isset($executionBranches['0'])) $branches = array('0' => $this->lang->branch->main) + $branches;
+            $branches = array('0' => $this->lang->branch->main, 'all' => $this->lang->branch->all) + $branches;
             return $branches;
         }
 
diff --git a/module/bug/model.php b/module/bug/model.php
index 5adc9e0c4a..e575b4daa3 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1869,7 +1869,7 @@ class bugModel extends model
                 ->where('t1.deleted')->eq(0)
                 ->beginIF(empty($build))->andWhere('t1.project')->eq($projectID)->fi()
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
-                ->beginIF(!empty($productID))->andWhere('t1.branch')->eq($branchID)->fi()
+                ->beginIF(!empty($productID) and $branchID != 'all')->andWhere('t1.branch')->eq($branchID)->fi()
                 ->beginIF($type == 'unresolved')->andWhere('t1.status')->eq('active')->fi()
                 ->beginIF($type == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
                 ->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi()
diff --git a/module/execution/control.php b/module/execution/control.php
index 6d0e3736eb..398661693c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -998,7 +998,7 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function bug($executionID = 0, $productID = 0, $branch = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function bug($executionID = 0, $productID = 0, $branch = 'all', $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load these two models. */
         $this->loadModel('bug');
@@ -1165,7 +1165,7 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function testcase($executionID = 0, $productID = 0, $branchID = 0, $type = 'all', $moduleID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function testcase($executionID = 0, $productID = 0, $branchID = 'all', $type = 'all', $moduleID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('testcase');
         $this->loadModel('testtask');
diff --git a/module/project/control.php b/module/project/control.php
index 0d712bdd9a..27d5313089 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1148,7 +1148,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function bug($projectID = 0, $productID = 0, $branchID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function bug($projectID = 0, $productID = 0, $branchID = 'all', $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load these two models. */
         $this->loadModel('bug');
@@ -1307,7 +1307,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function testcase($projectID = 0, $productID = 0, $branch = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function testcase($projectID = 0, $productID = 0, $branch = 'all', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('product');
         $this->session->set('bugList', $this->app->getURI(true), 'project');

From 8d1cacab6f1770c42b23ec446cad9b312498b2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 10:23:46 +0800
Subject: [PATCH 25/60]  * fix bug.

---
 module/product/model.php       | 4 +++-
 module/productplan/control.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index 5ec816a474..3bb5714f04 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1235,10 +1235,11 @@ class productModel extends model
      * @param  int    $branch
      * @param  int    $appendProject
      * @param  string $status all|closed|unclosed
+     * @param  string $param  multiple|
      * @access public
      * @return array
      */
-    public function getProjectPairsByProduct($productID, $branch = 0, $appendProject = 0, $status = '')
+    public function getProjectPairsByProduct($productID, $branch = 0, $appendProject = 0, $status = '', $param = '')
     {
         $product = $this->getById($productID);
 
@@ -1246,6 +1247,7 @@ class productModel extends model
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.product')->eq($productID)
             ->beginIF($status == 'closed')->andWhere('t2.status')->ne('closed')->fi()
+            ->beginIF(strpos($param, 'multiple') !== false)->andWhere('t2.multiple')->ne('0')->fi()
             ->andWhere('t2.type')->eq('project')
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->beginIF($product->type != 'normal' and $branch !== '')->andWhere('t1.branch')->in($branch)->fi()
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 7d3f57f94c..d0dd0b3263 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -370,7 +370,7 @@ class productplan extends control
         $this->view->orderBy          = $orderBy;
         $this->view->plans            = $this->productplan->getList($productID, $branch, $browseType, $pager, $sort, "", $queryID);
         $this->view->pager            = $pager;
-        $this->view->projects         = $this->product->getProjectPairsByProduct($productID, $branch, '', $status = 'closed');
+        $this->view->projects         = $this->product->getProjectPairsByProduct($productID, $branch, '', $status = 'closed', 'multiple');
         $this->view->statusList       = $this->lang->productplan->featureBar['browse'];
         $this->view->queryID          = $queryID;
         $this->display();
@@ -627,7 +627,7 @@ class productplan extends control
      */
     public function ajaxGetProjects($productID, $branch = 0)
     {
-        $projects = $this->loadModel('product')->getProjectPairsByProduct($productID, $branch, '', $status = 'closed');
+        $projects = $this->loadModel('product')->getProjectPairsByProduct($productID, $branch, '', $status = 'closed', 'multiple');
         echo html::select('project', $projects, key($projects), "class='form-control chosen'");
     }
 

From 4d4b1565f4102be79b417e0db9527989742dc721 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 10:23:54 +0800
Subject: [PATCH 26/60] * finish task #75923#75924

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 37efbfad94..cbab8e4866 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -79,7 +79,7 @@
     <?php endif;?>
     <?php
     if($productID) common::printIcon('story', 'report', "productID=$productID&branchID=&storyType=$storyType&browseType=$type&moduleID=$param&chartType=pie&projectID=$execution->id", '', 'button', 'bar-chart muted');
-    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe'");
+    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id&browseType=$type&storyType=$storyType", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe'");
 
     $canLinkStory = $execution->hasProduct or $execution->multiple;
     if(common::canModify('execution', $execution))
diff --git a/module/story/control.php b/module/story/control.php
index ad3acb388b..0877c6779d 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2777,7 +2777,7 @@ class story extends control
                 $this->config->story->datatable->fieldList['plan']['dataSource'] = array('module' => 'productplan', 'method' => 'getPairs', 'params' => $productIdList);
             }
 
-            $this->post->set('rows', $this->story->getExportStorys($executionID, $orderBy));
+            $this->post->set('rows', $this->story->getExportStorys($executionID, $orderBy, $storyType));
             $this->fetch('transfer', 'export', 'model=story');
         }
 
@@ -2816,7 +2816,7 @@ class story extends control
         if(isset($project->hasProduct) && !$project->hasProduct)
         {
             $filterFields = array('product,', 'branch,');
-            if($project->model != 'scrum') $filterFields[] = 'plan';
+            if($project->model != 'scrum') $filterFields[] = 'plan,';
             $this->config->story->exportFields = str_replace($filterFields, '', $this->config->story->exportFields);
         }
 
diff --git a/module/story/model.php b/module/story/model.php
index c7769f426f..0ed04d40b1 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5881,10 +5881,12 @@ class storyModel extends model
      * @access public
      * @return void
      */
-    public function getExportStorys($executionID, $orderBy = 'id_desc')
+    public function getExportStorys($executionID, $orderBy = 'id_desc', $storyType = 'story')
     {
         $this->loadModel('file');
         $this->loadModel('branch');
+
+        $this->replaceURLang($storyType);
         $storyLang   = $this->lang->story;
         $storyConfig = $this->config->story;
 

From 6534d1b7efbe7f5f468151a77fb7991c4cfa59ac Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 10:27:50 +0800
Subject: [PATCH 27/60] * Fix bug#29531.

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

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index c51bd5fcdd..7c036b443d 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -74,7 +74,7 @@ $canBatchCreateBug   = ($productID and common::hasPriv('bug', 'batchCreate') and
 $canImportBug        = ($productID and common::hasPriv('execution', 'importBug'));
 $canCreateStory      = ($productID and common::hasPriv('story', 'create'));
 $canBatchCreateStory = ($productID and common::hasPriv('story', 'batchCreate'));
-$canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory'));
+$canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory') and !empty($execution->hasProduct));
 $canLinkStoryByPlan  = ($productID and common::hasPriv('execution', 'importplanstories') and !empty($project->hasProduct));
 $hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan);
 $hasTaskButton       = ($canCreateTask or $canBatchCreateTask or $canImportBug);

From f0debe31d14409baa319aa8d33cf0ecdc69efe2f Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Tue, 15 Nov 2022 10:45:26 +0800
Subject: [PATCH 28/60] * Fix bug #29741.

---
 module/testcase/control.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 3fd762ac30..bc0c8115f8 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -348,8 +348,6 @@ class testcase extends control
         $stories  = array_chunk($stories, $pager->recPerPage);
 
         $this->view->title      = $this->lang->story->zeroCase;
-        $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $products[$productID]);
-        $this->view->position[] = $this->lang->story->zeroCase;
 
         $this->view->stories    = empty($stories) ? $stories : $stories[$pageID - 1];
         $this->view->users      = $this->user->getPairs('noletter');

From 8c70b80f78219732f62b2bea50a60fc661d69045 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 02:51:12 +0000
Subject: [PATCH 29/60]  * Fix bug #29713.

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

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 70f09e694a..9070a25ab4 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -334,7 +334,7 @@ tbody tr td:first-child input {display: none;}
                 </tr>
                 <?php if($build->execution):?>
                 <tr>
-                  <th><?php echo $lang->build->execution;?></th>
+                  <th><?php echo empty($multipleProject) ? $lang->build->project : $lang->build->execution;?></th>
                   <td><?php echo zget($executions, $build->execution);?></td>
                 </tr>
                 <?php else:?>

From e2d3a349cc39bfdfe49f8e7cb5cef2b5ef4834d1 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 10:55:39 +0800
Subject: [PATCH 30/60] * Fix bug#29531.

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

diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 5cb87219fe..a4c48dbb19 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -90,8 +90,8 @@
     $canImportBug        = ($productID and common::hasPriv('execution', 'importBug'));
     $canCreateStory      = ($productID and common::hasPriv('story', 'create'));
     $canBatchCreateStory = ($productID and common::hasPriv('story', 'batchCreate'));
-    $canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory'));
-    $canLinkStoryByPlan  = ($productID and common::hasPriv('execution', 'importplanstories') and !$hiddenPlan);
+    $canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory') and !empty($execution->hasProduct));
+    $canLinkStoryByPlan  = ($productID and common::hasPriv('execution', 'importplanstories') and !$hiddenPlan and !empty($execution->hasProduct));
     $hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan);
     $hasTaskButton       = ($canCreateTask or $canBatchCreateTask or $canImportBug);
     $hasBugButton        = ($canCreateBug or $canBatchCreateBug);

From 175dd773cb9d2da09eeae5c601925dda1e4f8e05 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 03:12:33 +0000
Subject: [PATCH 31/60]  * Fix bug #29614.

---
 module/product/config.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/product/config.php b/module/product/config.php
index eca608a237..da591a9343 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -3,13 +3,13 @@ $config->product = new stdclass();
 $config->product->orderBy         = 'isClosed,program_asc,order_asc';
 $config->product->showAllProjects = 0;
 
-$config->product->customBatchEditFields = 'line,PO,QD,RD,status,type,acl';
-if($config->systemMode == 'ALM') $config->product->customBatchEditFields = 'program,' . $config->product->customBatchEditFields;
+$config->product->customBatchEditFields = 'PO,QD,RD,status,type,acl';
+if($config->systemMode == 'ALM') $config->product->customBatchEditFields = 'program,line,' . $config->product->customBatchEditFields;
 
 $config->product->browse = new stdclass();
 $config->product->custom = new stdclass();
-$config->product->custom->batchEditFields = 'line,PO,QD,RD';
-if($config->systemMode == 'ALM') $config->product->custom->batchEditFields .= ',program';
+$config->product->custom->batchEditFields = 'PO,QD,RD';
+if($config->systemMode == 'ALM') $config->product->custom->batchEditFields .= ',program,line';
 
 $config->product->list = new stdclass();
 $config->product->list->exportFields = 'id,program,line,name,manager,draftStories,activeStories,changedStories,reviewingStories,closedStories,storyCompleteRate,bugs,unResolvedBugs,assignToNullBugs,bugFixedRate,plans,releases';
@@ -115,8 +115,11 @@ $config->product->all->search['fields']['createdBy']   = $lang->product->created
 $config->product->all->search['params']['name']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
 if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['id']          = array('operator' => '=',       'control' => 'input',  'values' => '');
-if($config->systemMode == 'ALM') $config->product->all->search['params']['program'] = array('operator' => '=', 'control' => 'select', 'values' => '');
-$config->product->all->search['params']['line']        = array('operator' => '=',       'control' => 'select', 'values' => '');
+if($config->systemMode == 'ALM')
+{
+    $config->product->all->search['params']['program'] = array('operator' => '=', 'control' => 'select', 'values' => '');
+    $config->product->all->search['params']['line']    = array('operator' => '=', 'control' => 'select', 'values' => '');
+}
 $config->product->all->search['params']['desc']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['PO']          = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->product->all->search['params']['QD']          = array('operator' => '=',       'control' => 'select', 'values' => 'users');

From 127139f803296a0132ccf479d677d7d5b5d4f6a4 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Tue, 15 Nov 2022 11:13:03 +0800
Subject: [PATCH 32/60] * Fix bug #29757.

---
 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 0815f377a5..3a11582c03 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -852,7 +852,7 @@ class treeModel extends model
         {
             $extra['productID']   = $id;
             $projectProductLink   = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all");
-            $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
+            $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&storyType=story&orderBy=&type=byProduct&praram=$id");
             $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
             if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' title=$product");
 

From 66be15c00fbbf78371d5ec759039610f8f4bac2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 11:13:04 +0800
Subject: [PATCH 33/60]  * fix bug #29736.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 6d0e3736eb..072219bda6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1808,7 +1808,7 @@ class execution extends control
 
         $this->loadModel('product');
         $allProducts   = $this->product->getProductPairsByProject($projectID, 'noclosed');
-        $copyProjects  = $this->loadModel('project')->getPairsByProgram(isset($project->parent) ? $project->parent : '', 'noclosed', '', 'order_asc', '', isset($project->model) ? $project->model : '', true);
+        $copyProjects  = $this->loadModel('project')->getPairsByProgram(isset($project->parent) ? $project->parent : '', 'noclosed', '', 'order_asc', '', isset($project->model) ? $project->model : '', 'multiple');
         $copyProjectID = ($projectID == 0) ? key($copyProjects) : $projectID;
 
         if(!empty($project->hasProduct)) $allProducts = array(0 => '') + $allProducts;
diff --git a/module/product/control.php b/module/product/control.php
index d14444e506..8f701aee51 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -100,7 +100,7 @@ class product extends control
         $accounts     = array();
         $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved, $orderBy, $pager);
         $product      = $this->product->getByID($productID);
-        $projects     = $this->project->getPairsByProgram($product->program, 'all', false, 'order_asc');
+        $projects     = $this->project->getPairsByProgram($product->program, 'all', false, 'order_asc', '', '', 'product');
 
         foreach($projectStats as $project)
         {
@@ -110,8 +110,6 @@ class product extends control
         $PMList = $this->user->getListByAccounts($accounts, 'account');
 
         $this->view->title        = $this->products[$productID] . $this->lang->colon . $this->lang->product->project;
-        $this->view->position[]   = $this->products[$productID];
-        $this->view->position[]   = $this->lang->product->project;
         $this->view->projectStats = $projectStats;
         $this->view->PMList       = $PMList;
         $this->view->productID    = $productID;
diff --git a/module/project/model.php b/module/project/model.php
index 11c14bb5a0..58f2142c85 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -792,11 +792,11 @@ class projectModel extends model
      * @param  string $orderBy
      * @param  string $excludedModel
      * @param  string $model
-     * @param  bool   $multiple
+     * @param  string $param multiple|product
      * @access public
      * @return object
      */
-    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc', $excludedModel = '', $model = '', $multiple = false)
+    public function getPairsByProgram($programID = '', $status = 'all', $isQueryAll = false, $orderBy = 'order_asc', $excludedModel = '', $model = '', $param = '')
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
         return $this->dao->select('id, name')->from(TABLE_PROJECT)
@@ -807,7 +807,8 @@ class projectModel extends model
             ->beginIF($status != 'all' and $status != 'noclosed')->andWhere('status')->eq($status)->fi()
             ->beginIF($excludedModel)->andWhere('model')->ne($excludedModel)->fi()
             ->beginIF($model)->andWhere('model')->eq($model)->fi()
-            ->beginIF($multiple)->andWhere('multiple')->eq(1)->fi()
+            ->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq(1)->fi()
+            ->beginIF(strpos($param, 'product') !== false)->andWhere('hasProduct')->eq(1)->fi()
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin and !$isQueryAll)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->orderBy($orderBy)

From d3887137bcc74cefcdf0eb6ab683e56293e6d594 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 11:16:11 +0800
Subject: [PATCH 34/60] * finish task #76338

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

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 24ccd1aa2e..f2411a486b 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -123,7 +123,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                     </div>
                   </td>
                 </tr>
-                <tr class='<?php if($product->shadow and zget($project, 'model') != 'scrum') echo 'hide'?>'>
+                <tr class='<?php if(!($product->shadow and zget($project, 'model') == 'scrum' 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>

From 9835f45987f96ca91e5a09b5c3403f2ffd8545d9 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 15 Nov 2022 13:09:44 +0800
Subject: [PATCH 35/60] * Fix bug #29749.

---
 module/project/view/execution.html.php |  2 ++
 module/transfer/control.php            |  4 ++--
 module/transfer/model.php              | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 1f95f153f7..3cc1368a99 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -42,10 +42,12 @@
     <?php if(common::hasPriv('execution', 'task')) echo html::checkbox('showTask', array('1' => $lang->programplan->stageCustom->task), '', $this->cookie->showTask ? 'checked=checked' : '');?>
   </div>
   <div class='btn-toolbar pull-right'>
+    <?php if($project->model == 'waterfall'):?>
     <div class="btn-group">
       <?php echo html::a('', "<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->project->bylist}'");?>
       <?php echo html::a($this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=gantt"), "<i class='icon-gantt-alt'></i> &nbsp;", '', "class='btn btn-icon switchBtn' title='{$lang->programplan->gantt}'");?>
     </div>
+    <?php endif;?>
     <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=project", "<i class='icon-export muted'> </i> " . $lang->export, '', "class='btn btn-link export'")?>
      <?php if(common::hasPriv('programplan', 'create') and $isStage):?>
      <?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-primary'");?>
diff --git a/module/transfer/control.php b/module/transfer/control.php
index 1f58dc5022..b9b7851107 100755
--- a/module/transfer/control.php
+++ b/module/transfer/control.php
@@ -159,14 +159,14 @@ class transfer extends control
 
         if($model == 'story')
         {
-            $product = $this->loadModel('product')->getByID($this->session->storyPortParams['productID']);
+            $product = $this->loadModel('product')->getByID($this->session->storyTransferParams['productID']);
             if($product->type == 'normal') unset($fields['branch']);
             if($this->session->storyType == 'requirement') unset($fields['plan']);
         }
 
         if($model == 'bug')
         {
-            $product = $this->loadModel('product')->getByID($this->session->bugPortParams['productID']);
+            $product = $this->loadModel('product')->getByID($this->session->bugTransferParams['productID']);
             if($product->type == 'normal') unset($fields['branch']);
             if($product->shadow and ($this->app->tab == 'execution' or $this->app->tab == 'project')) unset($fields['product']);
         }
diff --git a/module/transfer/model.php b/module/transfer/model.php
index 6ec348d984..0837f45652 100644
--- a/module/transfer/model.php
+++ b/module/transfer/model.php
@@ -56,16 +56,16 @@ class transferModel extends model
     }
 
     /**
-     * Check tmpFile.
+     * Check tmp file.
      *
      * @access public
      * @return void
      */
     public function checkTmpFile()
     {
-        $file      = $this->session->fileImportFileName;
-        $tmpPath   = $this->loadModel('file')->getPathOfImportedFile();
-        $tmpFile   = $tmpPath . DS . md5(basename($file));
+        $file    = $this->session->fileImportFileName;
+        $tmpPath = $this->loadModel('file')->getPathOfImportedFile();
+        $tmpFile = $tmpPath . DS . md5(basename($file));
 
         if($this->maxImport and file_exists($tmpFile)) return $tmpFile;
         return false;
@@ -196,7 +196,7 @@ class transferModel extends model
         $rows = $this->getRows($model, $fieldList);
         if($model == 'story')
         {
-            $product = $this->loadModel('product')->getByID((int)$this->session->storyPortParams['productID']);
+            $product = $this->loadModel('product')->getByID((int)$this->session->storyTransferParams['productID']);
             if($product and $product->shadow)
             {
                 foreach($rows as $id => $row)

From 11343aa6cc3ba9917c6cf0f603067401b617acee Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 15 Nov 2022 05:15:35 +0000
Subject: [PATCH 36/60] * Fix bug #29700.

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

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 9070a25ab4..9ca7217e2d 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -343,7 +343,7 @@ tbody tr td:first-child input {display: none;}
                   <td>
                     <?php $builds = '';?>
                     <?php foreach(explode(',', $build->builds) as $buildID):?>
-                    <?php $builds .= html::a($this->createLink('build', 'view', "buildID=$buildID") . "#app={$app->tab}", zget($buildPairs, $buildID)) . $lang->comma;?>
+                    <?php if($buildID) $builds .= html::a($this->createLink('build', 'view', "buildID=$buildID") . "#app={$app->tab}", zget($buildPairs, $buildID)) . $lang->comma;?>
                     <?php endforeach;?>
                     <?php echo rtrim($builds, $lang->comma);?>
                   </td>

From bd06ac3570a354e579f3b444a4421a5409da1110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 13:19:06 +0800
Subject: [PATCH 37/60]  * fix bug #29723.

---
 module/message/model.php          | 2 ++
 module/story/js/common.js         | 8 ++++----
 module/story/view/create.html.php | 4 ++++
 module/tutorial/lang/de.php       | 3 +++
 module/tutorial/lang/en.php       | 3 +++
 module/tutorial/lang/fr.php       | 3 +++
 module/tutorial/lang/zh-cn.php    | 3 +++
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/module/message/model.php b/module/message/model.php
index 03cc3f6639..72ca92a564 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -66,6 +66,8 @@ class messageModel extends model
      */
     public function send($objectType, $objectID, $actionType, $actionID, $actor = '', $extra = '')
     {
+        if(defined('TUTORIAL')) return;
+
         $objectType     = strtolower($objectType);
         $messageSetting = $this->config->message->setting;
         if(is_string($messageSetting)) $messageSetting = json_decode($messageSetting, true);
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 6a1503c104..5be7092e6e 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -22,7 +22,7 @@ $(function()
 
     $('#saveButton').on('click', function()
     {
-        $('#saveButton').attr('disabled', true);
+        $('#saveButton').attr('type', 'submit').attr('disabled', true);
         $('#saveDraftButton').attr('disabled', true);
 
         var storyStatus = !$('#reviewer').val() || $('#needNotReview').is(':checked') ? 'active' : 'reviewing';
@@ -31,7 +31,7 @@ $(function()
 
         setTimeout(function()
         {
-            $('#saveButton').removeAttr('disabled');
+            $('#saveButton').attr('type', 'button').removeAttr('disabled');
             $('#saveDraftButton').removeAttr('disabled');
         }, 1000);
     });
@@ -39,7 +39,7 @@ $(function()
     $('#saveDraftButton').on('click', function()
     {
         $('#saveButton').attr('disabled', true);
-        $('#saveDraftButton').attr('disabled', true);
+        $('#saveDraftButton').attr('type', 'submit').attr('disabled', true);
 
         storyStatus = 'draft';
         if(typeof(page) != 'undefined' && page == 'change') storyStatus = 'changing';
@@ -50,7 +50,7 @@ $(function()
         setTimeout(function()
         {
             $('#saveButton').removeAttr('disabled');
-            $('#saveDraftButton').removeAttr('disabled');
+            $('#saveDraftButton').attr('type', 'button').removeAttr('disabled');
         }, 1000);
     });
 })
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 5ba9b5c1a0..462b4df12f 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -297,8 +297,12 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
           <tr>
             <td colspan="5" class="text-center form-actions">
               <?php echo html::hidden('type', $type);?>
+              <?php if(defined('TUTORIAL')):?>
+              <?php echo html::submitButton();?>
+              <?php else:?>
               <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');?>
               <?php echo html::commonButton($lang->story->saveDraft, "id='saveDraftButton'", 'btn btn-secondary btn-wide');?>
+              <?php endif;?>
               <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton('', $source == 'bug' ? 'data-app=qa' : '');?>
             </td>
           </tr>
diff --git a/module/tutorial/lang/de.php b/module/tutorial/lang/de.php
index eb42def366..581481dc40 100644
--- a/module/tutorial/lang/de.php
+++ b/module/tutorial/lang/de.php
@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Aufgaben aufteilen: </p><ul><
 $lang->tutorial->tasks['createBug']         = array('title' => 'Bug melden');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Bug erstellen');
 $lang->tutorial->tasks['createBug']['desc'] = "<p>Bug erstellen: </p><ul><li data-target='nav'>Öffnen <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Einen Bug erstellen</span>；</li><li data-target='form'>Tragen Sie die Bug Informationen ein:</li><li data-target='submit'>Speichern</li></ul>";
+
+global $config;
+if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 026fc7c429..5182e29620 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: <
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
+
+global $config;
+if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);
diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php
index b1a29b235e..54852235f1 100644
--- a/module/tutorial/lang/fr.php
+++ b/module/tutorial/lang/fr.php
@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>Task breakdown for a story: <
 $lang->tutorial->tasks['createBug']         = array('title' => 'Report Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Report  Bug');
 $lang->tutorial->tasks['createBug']['desc'] = "<p>Report a Bug: </p><ul><li data-target='nav'>Open <span class='task-nav'> Test <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> Report Bug</span>；</li><li data-target='form'>Fill the form with bug information:</li><li data-target='submit'>Save</li></ul>";
+
+global $config;
+if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index 83b8f77bee..486c56f16b 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -74,3 +74,6 @@ $lang->tutorial->tasks['createTask']['desc'] = "<p>将执行{$lang->SRCommon}分
 $lang->tutorial->tasks['createBug']         = array('title' => '提Bug');
 $lang->tutorial->tasks['createBug']['nav']  = array('app' => 'qa', 'module' => 'bug', 'method' => 'create', 'menuModule' => 'bug', 'menu' => 'bug', 'target' => '.create-bug-btn', 'vars' => 'productID=0', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '提Bug');
 $lang->tutorial->tasks['createBug']['desc'] = "<p>在系统中提交一个Bug：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 测试 <i class='icon icon-angle-right'></i> Bug <i class='icon icon-angle-right'></i> 提Bug</span>；</li><li data-target='form'>在表单中填写Bug信息；</li><li data-target='submit'>保存Bug信息。</li></ul>";
+
+global $config;
+if($config->systemMode == 'light') unset($lang->tutorial->tasks['createProgram']);

From 7693217115b58b9bed26fd5c5577e292469fc842 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 05:20:17 +0000
Subject: [PATCH 38/60]  * Fix bug #29621.

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

diff --git a/module/project/config.php b/module/project/config.php
index afbb5e6010..d3149df35e 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -11,7 +11,8 @@ $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simple
 $config->project->editor->view     = array('id' => 'lastComment', 'tools' => 'simpleTools');
 
 $config->project->list = new stdclass();
-$config->project->list->exportFields = 'id,parent,code,name,hasProduct,linkedProducts,status,begin,end,budget,PM,end,desc';
+$config->project->list->exportFields = 'id,code,name,hasProduct,linkedProducts,status,begin,end,budget,PM,end,desc';
+if($config->systemMode == 'ALM') $config->project->list->exportFields = substr_replace($config->project->list->exportFields, ',parent', 2, 0);
 
 $config->project->create = new stdclass();
 $config->project->edit   = new stdclass();

From aed6871cd8effa7f16544af876bba81029e1a04e Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 15 Nov 2022 05:20:46 +0000
Subject: [PATCH 39/60] * Fix bug #29694.

---
 module/execution/view/build.html.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index e1c014cd0d..c1610c1616 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -51,7 +51,6 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name w-200px text-left <?php echo $hidden;?>"><?php echo $lang->build->product;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
-          <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
           <th class="c-url"><?php echo $lang->build->scmPath;?></th>
           <th class="c-url"><?php echo $lang->build->filePath;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
@@ -69,7 +68,6 @@
             <?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
             <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
           </td>
-          <td class="c-name text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
           <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
           <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
           <td class="c-date"><?php echo $build->date?></td>

From 72c38e942ec41d29baf2fb95a776e7bee81b3ba8 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 13:39:09 +0800
Subject: [PATCH 40/60] add param

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

diff --git a/module/story/model.php b/module/story/model.php
index 0ed04d40b1..e0f14160fc 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5878,6 +5878,7 @@ class storyModel extends model
      *
      * @param  int    $executionID
      * @param  string $orderBy
+     * @param  string $storyType
      * @access public
      * @return void
      */

From 231e210373b5b70a769c9afd8bcd219c4620b088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 13:47:37 +0800
Subject: [PATCH 41/60]  * code for task #29718.

---
 module/projectrelease/control.php        | 3 ---
 module/projectrelease/view/view.html.php | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 2771cb306c..f39e8cc6e2 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -83,15 +83,12 @@ class projectrelease extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         $releases = $this->projectrelease->getList($projectID, $type, $orderBy, $pager);
-        $productIdList = array();
-        foreach($releases as $release) $productIdList[$release->product] = $release->product;
 
         $this->view->title       = $objectName . $this->lang->colon . $this->lang->release->browse;
         $this->view->execution   = $execution;
         $this->view->project     = $project;
         $this->view->products    = $this->loadModel('product')->getProducts($projectID);
         $this->view->releases    = $releases;
-        $this->view->builds      = $this->loadModel('build')->getBuildPairs($productIdList, 'all', 'notrunk,withbranch', $projectID, 'project');
         $this->view->projectID   = $projectID;
         $this->view->executionID = $executionID;
         $this->view->type        = $type;
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index a2095e0c51..4f8b471a9c 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -358,7 +358,7 @@
                         {
                             $buildHtml[] = html::a($this->createLink($buildInfo->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $buildInfo->name, '', "data-app='project'");
                         }
-                        echo join(', ', $buildHtml);
+                        echo join($lang->comma, $buildHtml);
                         ?>
                       </td>
                     </tr>

From 0afdea43824d0cf6f0f1a52d4944dc13d83575ac Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 15 Nov 2022 05:50:07 +0000
Subject: [PATCH 42/60] * Fix bug #29759.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 072219bda6..cc664c764c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1826,7 +1826,7 @@ class execution extends control
         $this->view->code                = $code;
         $this->view->team                = $team;
         $this->view->teams               = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
-        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
+        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed,multiple');
         $this->view->copyProjects        = $copyProjects;
         $this->view->copyExecutions      = array('' => '') + $this->execution->getList($copyProjectID);
         $this->view->executionID         = $executionID;
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 4479d6883d..1070aef18e 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1378,7 +1378,7 @@ class kanban extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $this->view->projects            = array($this->lang->kanban->allProjects) + $this->project->getPairsByProgram();
+        $this->view->projects            = array($this->lang->kanban->allProjects) + $this->project->getPairsByProgram('', 'all', false, '', '', '', 'multiple');
         $this->view->selectedProjectID   = $selectedProjectID;
         $this->view->lanePairs           = $this->kanban->getLanePairsByGroup($groupID);
         $this->view->executions2Imported = $this->execution->getStatData($selectedProjectID, 'undone', 0, 0, false, '', 'id_asc', $pager);

From 8bc640bd2925e42aa871d100dd1810a60be01717 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 13:50:31 +0800
Subject: [PATCH 43/60] * Fix bug#29752.

---
 module/my/view/task.html.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 64caf5f5e8..950103d321 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -104,15 +104,16 @@
             <td class='c-name <?php if(!empty($task->children)) echo 'has-child';?>' title='<?php echo $task->name?>'>
               <?php if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
               <?php
+              $dataApp = empty($task->executionMultiple) ? 'project' : 'execution';
               if($task->parent > 0)
               {
-                  echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ' . html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->parentName . ' / '. $task->name, '', "title='{$task->parentName} / {$task->name}'");
+                  echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ' . html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->parentName . ' / '. $task->name, '', "title='{$task->parentName} / {$task->name}' data-app='$dataApp'");
               }
               else
               {
                   $onlybody = $task->executionType == 'kanban' ?  true : '';
                   $class    = $task->executionType == 'kanban' ? 'iframe' : '';
-                  echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");
+                  echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color' data-app='$dataApp'");
               }
               ?>
               <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-right"></i></a>';?>
@@ -189,8 +190,9 @@
                 <?php printf('%03d', $child->id);?>
               </td>
               <td class='c-name' title='<?php echo $child->name?>'>
+                <?php $dataApp = empty($child->executionMultiple) ? 'project' : 'execution';?>
                 <?php if($child->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
-                <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?>
+                <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color' data-app='$dataApp'");?>
               </td>
               <td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $child->pri;?>' title='<?php echo zget($lang->task->priList, $child->pri);?>'><?php echo zget($lang->task->priList, $child->pri);?></span></td>
               <td class='c-status'>

From 4352117e4daa82864d79f071e93e478afc12f908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 13:56:40 +0800
Subject: [PATCH 44/60]  * fix bug #29699.

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

diff --git a/module/my/model.php b/module/my/model.php
index 926ec8e9a9..3a432a791d 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1301,6 +1301,7 @@ class myModel extends model
             $review->time   = $action->date;
             $review->result = strtolower($action->extra);
             $review->status = $objectType == 'attend' ? $object->reviewStatus : $object->status;
+            if(strpos($review->result, ',') !== false) list($review->result) = explode(',', $review->result);
 
             if($review->type == 'review') $review->type = 'project';
             if($review->type == 'case')   $review->type = 'testcase';

From 146559bc2db219403c433146d97b9e14861fe2f7 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Tue, 15 Nov 2022 13:57:03 +0800
Subject: [PATCH 45/60] * Fix bug #29682.

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

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index aab887a7cf..91b29a8998 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -53,7 +53,7 @@
     <?php
     $otherParam = 'storyID=&projectID=';
     $tab        = 'product';
-    if($this->app->rawModule == 'projectstory')
+    if($this->app->rawModule == 'projectstory' or $this->app->tab == 'project')
     {
         $otherParam = "storyID=&projectID={$this->session->project}";
         $tab        = 'project';

From dcd256203af8fab9682089d81f71ab3bc0932fa9 Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 15 Nov 2022 06:15:10 +0000
Subject: [PATCH 46/60] * Fix bug #29735.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index dc5f1977a1..eb4576d021 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -657,6 +657,7 @@ class execution extends control
         $this->config->bug->search['module'] = 'importBug';
         $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList;
 
+
         $this->loadModel('tree');
         $bugModules = array();
         foreach($products as $productID => $productName)
@@ -685,6 +686,7 @@ class execution extends control
         unset($this->config->bug->search['fields']['resolvedDate']);
         unset($this->config->bug->search['fields']['closedDate']);
         unset($this->config->bug->search['fields']['branch']);
+        if(empty($execution->multiple) && empty($execution->hasProduct)) unset($this->config->bug->search['fields']['plan']);
         if(empty($project->hasProduct))
         {
             unset($this->config->bug->search['fields']['product']);

From dfdcc78206c4621d1beddefe8d6fa05925f7495d Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 15 Nov 2022 06:17:36 +0000
Subject: [PATCH 47/60] * Optimize code.

---
 module/execution/control.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index eb4576d021..e4f08545a8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -657,7 +657,6 @@ class execution extends control
         $this->config->bug->search['module'] = 'importBug';
         $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList;
 
-
         $this->loadModel('tree');
         $bugModules = array();
         foreach($products as $productID => $productName)
@@ -692,7 +691,6 @@ class execution extends control
             unset($this->config->bug->search['fields']['product']);
             if($project->model !== 'scrum') unset($this->config->bug->search['fields']['plan']);
         }
-
         unset($this->config->bug->search['params']['resolvedBy']);
         unset($this->config->bug->search['params']['closedBy']);
         unset($this->config->bug->search['params']['status']);

From 4849895b696b785755788d823326fbbc8a686151 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 14:18:36 +0800
Subject: [PATCH 48/60] * finish task #76334

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

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index de9280d5d1..d5a9edadfd 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -253,7 +253,7 @@ $lang->scrum->menu->settings['subMenu']->members     = array('link' => "{$lang->
 $lang->scrum->menu->settings['subMenu']->whitelist   = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel');
 $lang->scrum->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder');
 $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv');
-$lang->scrum->menu->settings['subMenu']->module      = array('link' => "{$lang->module}|tree|browse|product=%s&view=story");
+$lang->scrum->menu->settings['subMenu']->module      = array('link' => "{$lang->module}|tree|browse|product=%s&view=story", 'subModule' => 'tree');
 $lang->scrum->menu->settings['subMenu']->managerepo  = array('link' => "{$lang->repo->codeRepo}|project|managerepo|project=%s");
 
 /* Waterfall menu. */

From c9f2e7c27f3031fd50a979ac8906e43a401117c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 14:25:56 +0800
Subject: [PATCH 49/60]  * fix bug #29674.

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

diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index e892681bf2..70525fda4d 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -47,8 +47,8 @@ $lang->misc->zentao->cowin['feedback']     = "Feedback";
 $lang->misc->zentao->cowin['recommend']    = "More";
 
 $lang->misc->zentao->service['zentaotrain'] = 'ZenTao Training';
-$lang->misc->zentao->service['idc']         = 'Zentao Cloud';
-$lang->misc->zentao->service['custom']      = 'Zentao Custom';
+$lang->misc->zentao->service['idc']         = 'ZenTao Cloud';
+$lang->misc->zentao->service['custom']      = 'ZenTao Custom';
 
 global $config;
 $lang->misc->zentao->others['chanzhi']  = "<img src='{$config->webRoot}theme/default/images/main/chanzhi.ico' /> Zsite";
@@ -100,7 +100,7 @@ $lang->misc->feature->close          = 'Close';
 $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
-$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
+$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
 $lang->misc->releaseDate['17.8']        = '2022-11-02';
@@ -225,7 +225,7 @@ $lang->misc->feature->all['15.0.3'][]      = array('title' => 'Fix Bug', 'desc'
 $lang->misc->feature->all['15.0.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['15.0.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['15.0'][]        = array('title' => 'Fix Bug', 'desc' => '');
-$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details，Fix bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details, fix bug.', 'desc' => '');
 $lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
 $lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index b63f934519..fb0e92e185 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -100,7 +100,7 @@ $lang->misc->feature->close          = 'Close';
 $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
-$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
+$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
 $lang->misc->releaseDate['17.8']        = '2022-11-02';
@@ -223,9 +223,9 @@ $lang->misc->feature->all['15.2'][]       = array('title' => 'Optimize the new v
 
 $lang->misc->feature->all['15.0.3'][]      = array('title' => 'Fix Bug', 'desc' => '');
 $lang->misc->feature->all['15.0.2'][]      = array('title' => 'Fix Bug', 'desc' => '');
-$lang->misc->feature->all['15.0.1'][]      = array('title' => 'Fix bug', 'desc' => '');
-$lang->misc->feature->all['15.0'][]        = array('title' => 'Fix bug', 'desc' => '');
-$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details，Fix bug', 'desc' => '');
+$lang->misc->feature->all['15.0.1'][]      = array('title' => 'Fix Bug', 'desc' => '');
+$lang->misc->feature->all['15.0'][]        = array('title' => 'Fix Bug', 'desc' => '');
+$lang->misc->feature->all['15.0.rc3'][]    = array('title' => 'Adjust details, fix bug.', 'desc' => '');
 $lang->misc->feature->all['15.0.rc2'][]    = array('title' => 'Fix Bug.', 'desc' => '');
 $lang->misc->feature->all['15.0.rc1'][]    = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => '');
 $lang->misc->feature->all['12.5.3'][]      = array('title' => 'Adjust annual data.', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 0bc2366d43..7b47d01dc1 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -47,8 +47,8 @@ $lang->misc->zentao->cowin['feedback']     = "Feedback";
 $lang->misc->zentao->cowin['recommend']    = "Plus...";
 
 $lang->misc->zentao->service['zentaotrain'] = 'ZenTao Training';
-$lang->misc->zentao->service['idc']         = 'Zentao Cloud';
-$lang->misc->zentao->service['custom']      = 'Zentao Custom';
+$lang->misc->zentao->service['idc']         = 'ZenTao Cloud';
+$lang->misc->zentao->service['custom']      = 'ZenTao Custom';
 
 global $config;
 $lang->misc->zentao->others['chanzhi']  = "<img src='{$config->webRoot}theme/default/images/main/chanzhi.ico' /> Zsite";
@@ -100,7 +100,7 @@ $lang->misc->feature->close          = 'Close';
 $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
-$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
+$lang->misc->feature->visionsDesc    = "<p>The concept of interface has been added since 16.5. Users can deal with R&D affairs in <span style='color: #0c60e1'>[Full Feature Interface]</span> and daily office affairs in <span style='color: #0c60e1'>[Operation Management Interface]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions_en.png';
 
 $lang->misc->releaseDate['17.8']        = '2022-11-02';
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index d5b2ef9cc6..f9dcacc66a 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -100,7 +100,7 @@ $lang->misc->feature->close          = '关闭';
 $lang->misc->feature->downloadFile   = '下载新版本功能介绍文档';
 $lang->misc->feature->tutorialDesc   = "<p>禅道15系列新增了多项功能，您可以通过“<strong>新手引导教程</strong>”快速了解禅道的基本使用方法。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-新手引导</span>]，点击新手引导，即可进入新手引导教程。</p>";
 $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“青春蓝”主题，页面呈现更加美观，体验更加友好。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-主题-青春蓝</span>]，点击青春蓝，即可设置成功。</p>";
-$lang->misc->feature->visionsDesc    = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[迅捷界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
+$lang->misc->feature->visionsDesc    = "<p>从16.5开始增加了界面概念，用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[运营管理界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面，点击当前界面名称可查看和切换其他的界面。</p>";
 $lang->misc->feature->visionsImage   = 'theme/default/images/main/visions.png';
 
 $lang->misc->releaseDate['17.8']        = '2022-11-02';

From c155808a69d97a77aaba94806f05ff9fcbbaeb45 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 14:29:27 +0800
Subject: [PATCH 50/60] fix code error

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

diff --git a/module/execution/control.php b/module/execution/control.php
index dc5f1977a1..50b7d6892f 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1733,7 +1733,7 @@ class execution extends control
             $this->view->linkedBranches = $linkedBranches;
         }
 
-        if(!$project->hasProduct)
+        if(!empty($project->hasProduct))
         {
             $shadowProduct = $this->loadModel('product')->getShadowProductByProject($project->id);
             $productPlan   = $this->loadModel('productplan')->getPairs($shadowProduct->id, '0,0', 'noclosed,unexpired', true);
@@ -1744,7 +1744,7 @@ class execution extends control
             if(isset($_POST['attribute']) and in_array($_POST['attribute'], array('request', 'design', 'review'))) unset($_POST['plans']);
 
             /* No product execution link plans. */
-            if(!$project->hasProduct and !empty($_POST['plans']))
+            if(!empty($project->hasProduct) and !empty($_POST['plans']))
             {
                 $plansItem = array();
                 foreach($_POST['plans'] as $planItem)

From 8e872c71e3b4fed78b71e1ef01f545ff0a015a5d Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 06:49:19 +0000
Subject: [PATCH 51/60]  * Fix bug #29623.

---
 module/program/model.php                    | 55 ++++------------
 module/project/control.php                  | 70 ++++++++++++---------
 module/project/view/manageproducts.html.php | 41 ++++++++++--
 3 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index 393556a4ef..9ee3ab4e0e 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -67,10 +67,11 @@ class programModel extends model
      * @param  string       $status     all|noclosed
      * @param  string|array $append
      * @param  string|int   $shadow     all | 0 | 1
+     * @param  bool         $withProgram
      * @access public
      * @return array
      */
-    public function getProductPairs($programID = 0, $mode = 'assign', $status = 'all', $append = '', $shadow = 0)
+    public function getProductPairs($programID = 0, $mode = 'assign', $status = 'all', $append = '', $shadow = 0, $withProgram = false)
     {
         /* Get the top programID. */
         if($programID)
@@ -84,72 +85,40 @@ class programModel extends model
         if(!empty($append) and is_array($append)) $append = implode(',', $append);
         $views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
 
-        return $this->dao->select('*')->from(TABLE_PRODUCT)
+        $dao = $this->dao->select('id, name, program')->from(TABLE_PRODUCT)
             ->where('deleted')->eq(0)
             ->andWhere('vision')->eq($this->config->vision)
             ->beginIF($shadow !== 'all')->andWhere('shadow')->eq((int)$shadow)->fi()
             ->beginIF($mode == 'assign')->andWhere('program')->eq($programID)->fi()
             ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($views)->fi()
-            ->fetchPairs('id', 'name');
-    }
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($views)->fi();
 
-    /**
-     * Get product pairs which name with program.
-     *
-     * @param  int    $programID
-     * @param  string $mode
-     * @param  string $status
-     * @param  string $append
-     * @param  int    $shadow
-     * @access public
-     * @return array
-     */
-    public function getProductPairsWithProgram($programID = 0, $mode = 'assign', $status = 'all', $append = '', $shadow = 0)
-    {
-        /* Get the top programID. */
-        if($programID)
-        {
-            $program   = $this->getByID($programID);
-            $path      = array_filter(explode(',', $program->path));
-            $programID = current($path);
-        }
+        if(!$withProgram) return $dao->fetchPairs('id', 'name');
 
-        /* When mode equals assign and programID equals 0, you can query the standalone product. */
-        if(!empty($append) and is_array($append)) $append = implode(',', $append);
-        $views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
-
-        $products = $this->dao->select("t1.id, t1.program, CONCAT(IF(t2.name IS NOT NULL, t2.name, ''), '/', t1.name) AS name")->from(TABLE_PRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.program = t2.id')
-            ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.vision')->eq($this->config->vision)
-            ->beginIF($shadow !== 'all')->andWhere('t1.shadow')->eq((int)$shadow)->fi()
-            ->beginIF($mode == 'assign')->andWhere('t1.program')->eq($programID)->fi()
-            ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($views)->fi()
-            ->orderBy('t1.program, t1.order_asc')
-            ->fetchGroup('program');
+        $products = $dao->orderBy('program,order')->fetchGroup('program');
+        $productPrograms = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('type')->eq('program')->andWhere('deleted')->eq('0')->fetchPairs();
 
         /* Put products of current program first.*/
         if($mode != 'assign' && $programID)
         {
             $currentProgramProducts = $products[$programID];
-
             unset($products[$programID]);
-
             array_unshift($products, $currentProgramProducts);
         }
 
         $productPairs = array();
         foreach($products as $programProducts)
         {
-            foreach($programProducts as $product) $productPairs[$product->id] = $product->name;
+            foreach($programProducts as $product)
+            {
+                $programName = zget($productPrograms, $product->program, '') . '/';
+                $productPairs[$product->id] = $programName . $product->name;
+            }
         }
 
         return $productPairs;
     }
 
-
     /**
      * Get program by id.
      *
diff --git a/module/project/control.php b/module/project/control.php
index 0d712bdd9a..b3869cf63e 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -283,7 +283,8 @@ class project extends control
 
         if($objectType == 'program')
         {
-            $allProducts = array(0 => '') + $this->program->getProductPairsWithProgram($selectedProgramID, 'all', 'noclosed');
+            $withProgram = $this->config->systemMode == 'ALM' ? true : false;
+            $allProducts = array(0 => '') + $this->program->getProductPairs($selectedProgramID, 'all', 'noclosed', '', 0, $withProgram);
             $data['allProducts'] = html::select("products[]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");
             $data['plans']       = html::select('plans[][][]', '', '', 'class=\'form-control chosen\' multiple');
         }
@@ -603,13 +604,16 @@ class project extends control
         $this->config->executionCommonList[$this->app->getClientLang()][0] :
         $this->config->executionCommonList[$this->app->getClientLang()][1];
 
+        $withProgram = $this->config->systemMode == 'ALM' ? true : false;
+        $allProducts = array('0' => '') + $this->program->getProductPairs(0, 'all', 'noclosed', '', $shadow, $withProgram);
+
         $this->view->title               = $this->lang->project->create;
         $this->view->gobackLink          = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('project', 'browse') : '';
         $this->view->pmUsers             = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst');
         $this->view->users               = $this->user->getPairs('noclosed|nodeleted');
         $this->view->copyProjects        = $this->project->getPairsByModel($model);
         $this->view->products            = $products;
-        $this->view->allProducts         = array('0' => '') + $this->program->getProductPairsWithProgram(0, 'all', 'noclosed', '', $shadow);
+        $this->view->allProducts         = $allProducts;
         $this->view->productPlans        = array('0' => '') + $productPlans;
         $this->view->branchGroups        = $this->loadModel('branch')->getByProducts(array_keys($products), 'noclosed');
         $this->view->programID           = $programID;
@@ -713,12 +717,14 @@ class project extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
         }
 
+        $withProgram = $this->config->systemMode == 'ALM' ? true : false;
+
         $linkedBranches      = array();
         $linkedBranchList    = array();
         $productPlans        = array(0 => '');
         $branches            = $this->project->getBranchesByProject($projectID);
         $linkedProductIdList = empty($branches) ? '' : array_keys($branches);
-        $allProducts         = $this->program->getProductPairsWithProgram($project->parent, 'all', 'noclosed');
+        $allProducts         = $this->program->getProductPairs($project->parent, 'all', 'noclosed', '', 0, $withProgram);
         $linkedProducts      = $this->loadModel('product')->getProducts($projectID, 'all', '', true, $linkedProductIdList);
         $parentProject       = $this->program->getByID($project->parent);
         $plans               = $this->productplan->getGroupByProduct(array_keys($linkedProducts), 'skipParent|unexpired');
@@ -2228,43 +2234,48 @@ class project extends control
             }
         }
 
-        $branchGroups           = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed');
-        $productsGroupByProgram = $this->product->getProductsGroupByProgram();
-
-        $currentProducts = array();
-        $otherProducts   = array();
-        foreach($productsGroupByProgram as $programID => $programProducts)
+        $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed');
+        if($this->config->systemMode == 'ALM')
         {
-            if($programID != $project->parent)
-            {
-                foreach($programProducts as $productID => $productName)
-                {
-                    if(!empty($branchGroups[$productID]))
-                    {
-                        foreach($branchGroups[$productID] as $branchID => $branchName)
-                        {
-                            if(isset($linkedProducts[$productID]) and isset($linkedBranches[$productID][$branchID])) continue;
+            $productsGroupByProgram = $this->product->getProductsGroupByProgram();
 
-                            $otherProducts["{$productID}_{$branchID}"] = $productName . '_' . $branchName;
+            $currentProducts = array();
+            $otherProducts   = array();
+            foreach($productsGroupByProgram as $programID => $programProducts)
+            {
+                if($programID != $project->parent)
+                {
+                    foreach($programProducts as $productID => $productName)
+                    {
+                        if(!empty($branchGroups[$productID]))
+                        {
+                            foreach($branchGroups[$productID] as $branchID => $branchName)
+                            {
+                                if(isset($linkedProducts[$productID]) and isset($linkedBranches[$productID][$branchID])) continue;
+
+                                $otherProducts["{$productID}_{$branchID}"] = $productName . '_' . $branchName;
+                            }
+                        }
+                        else
+                        {
+                            if(isset($linkedProducts[$productID])) continue;
+                            $otherProducts[$productID] = $productName;
                         }
                     }
-                    else
-                    {
-                        if(isset($linkedProducts[$productID])) continue;
-                        $otherProducts[$productID] = $productName;
-                    }
+                }
+                else
+                {
+                    $currentProducts += $programProducts;
                 }
             }
-            else
-            {
-                $currentProducts += $programProducts;
-            }
+
+            $this->view->currentProducts = $currentProducts;
+            $this->view->otherProducts   = $otherProducts;
         }
 
         /* Assign. */
         $this->view->title                    = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
         $this->view->project                  = $project;
-        $this->view->currentProducts          = $currentProducts;
         $this->view->linkedProducts           = $linkedProducts;
         $this->view->linkedBranches           = $linkedBranches;
         $this->view->branches                 = $branches;
@@ -2275,7 +2286,6 @@ class project extends control
         $this->view->branchGroups             = $branchGroups;
         $this->view->allBranches              = $this->branch->getByProducts(array_keys($allProducts), 'ignoreNormal');
         $this->view->allProducts              = $allProducts;
-        $this->view->otherProducts            = $otherProducts;
 
         $this->display();
     }
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index ca1c6fe424..5bac169764 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -23,9 +23,11 @@
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->manageProducts;?></span></span>
   </div>
 
+  <?php if($this->config->systemMode == 'ALM'):?>
   <div class='btn-toolbar pull-right'>
     <button type='button' class='btn btn-primary' data-toggle='modal' data-target='#otherProductsModal'><i class='icon icon-link'></i> <?php echo $lang->project->manageOtherProducts; ?></button>
   </div>
+  <?php endif;?>
 </div>
 <div id='mainContent'>
   <div class='cell'>
@@ -46,9 +48,34 @@
             </div>
           </div>
           <?php echo html::hidden("branch[$i]", $branchID);?>
-          <?php if(!isset($branchGroups[$productID])) unset($currentProducts[$productID]);?>
-          <?php if(isset($branchGroups[$productID][$branchID])) unset($branchGroups[$productID][$branchID]);?>
-          <?php if(isset($branchGroups[$productID]) and empty($branchGroups[$productID])) unset($currentProducts[$productID]);?>
+
+          <?php
+          if(!isset($branchGroups[$productID]))
+          {
+              if($this->config->systemMode == 'ALM')
+              {
+                  unset($currentProducts[$productID]);
+              }
+              else
+              {
+                  unset($allProducts[$productID]);
+              }
+          }
+
+          if(isset($branchGroups[$productID][$branchID])) unset($branchGroups[$productID][$branchID]);
+
+          if(isset($branchGroups[$productID]) and empty($branchGroups[$productID]))
+          {
+              if($this->config->systemMode == 'ALM')
+              {
+                  unset($currentProducts[$productID]);
+              }
+              else
+              {
+                  unset($allProducts[$productID]);
+              }
+          }
+          ?>
           <?php $i++;?>
           <?php endforeach;?>
           <?php endforeach;?>
@@ -57,7 +84,10 @@
       <div class='detail'>
         <div class='detail-title'><?php echo $lang->project->unlinkedProducts;?></div>
         <div class='detail-content row'>
-          <?php foreach($currentProducts as $productID => $productName):?>
+          <?php
+          $unlinkedProducts = $this->config->systemMode == 'ALM' ? $currentProducts : $allProducts;
+          foreach($unlinkedProducts as $productID => $productName):
+          ?>
           <div class='col-sm-4'>
             <div class='product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
               <div class="checkbox-primary" title='<?php echo $productName;?>'>
@@ -75,6 +105,8 @@
         <?php echo html::hidden("post", 'post');?>
         <?php echo html::submitButton();?>
       </div>
+
+      <?php if($this->config->systemMode == 'ALM'):?>
       <div class='modal fade' id='otherProductsModal'>
         <div class='modal-content'>
           <div class='modal-dialog w-600px'>
@@ -97,6 +129,7 @@
           </div>
         </div>
       </div>
+      <?php endif;?>
     </form>
   </div>
 </div>

From 37caf8646179c0ba87ac747d76a0b22eb816edc6 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 06:58:54 +0000
Subject: [PATCH 52/60]  * Fix bug #29665.

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

diff --git a/module/project/control.php b/module/project/control.php
index b3869cf63e..a316d3233c 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -605,7 +605,7 @@ class project extends control
         $this->config->executionCommonList[$this->app->getClientLang()][1];
 
         $withProgram = $this->config->systemMode == 'ALM' ? true : false;
-        $allProducts = array('0' => '') + $this->program->getProductPairs(0, 'all', 'noclosed', '', $shadow, $withProgram);
+        $allProducts = array('0' => '') + $this->program->getProductPairs($programID, 'all', 'noclosed', '', $shadow, $withProgram);
 
         $this->view->title               = $this->lang->project->create;
         $this->view->gobackLink          = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('project', 'browse') : '';

From f950d1fa826534b7b994c1ed8f897d375de8f5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 15 Nov 2022 15:03:32 +0800
Subject: [PATCH 53/60]  * fix bug #76334.

---
 module/common/lang/menu.php |  4 ++--
 module/project/model.php    | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index d5a9edadfd..524e31a066 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -215,7 +215,7 @@ $lang->scrum->menu->devops      = array('link' => "{$lang->repo->common}|repo|br
 $lang->scrum->menu->build       = array('link' => "{$lang->build->common}|project|build|project=%s", 'subModule' => 'projectbuild');
 $lang->scrum->menu->release     = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
 $lang->scrum->menu->dynamic     = array('link' => "$lang->dynamic|project|dynamic|project=%s");
-$lang->scrum->menu->settings    = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team,managerepo');
+$lang->scrum->menu->settings    = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team,managerepo', 'exclude' => 'tree-browsetask');
 
 $lang->scrum->menu->storyGroup['dropMenu'] = new stdclass();
 $lang->scrum->menu->storyGroup['dropMenu']->story       = array('link' => "{$lang->SRCommon}|projectstory|story|projectID=%s&productID=%s", 'subModule' => 'projectstory,tree');
@@ -253,7 +253,7 @@ $lang->scrum->menu->settings['subMenu']->members     = array('link' => "{$lang->
 $lang->scrum->menu->settings['subMenu']->whitelist   = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel');
 $lang->scrum->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder');
 $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv');
-$lang->scrum->menu->settings['subMenu']->module      = array('link' => "{$lang->module}|tree|browse|product=%s&view=story", 'subModule' => 'tree');
+$lang->scrum->menu->settings['subMenu']->module      = array('link' => "{$lang->module}|tree|browse|product=%s&view=story");
 $lang->scrum->menu->settings['subMenu']->managerepo  = array('link' => "{$lang->repo->codeRepo}|project|managerepo|project=%s");
 
 /* Waterfall menu. */
diff --git a/module/project/model.php b/module/project/model.php
index 58f2142c85..472a23d353 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2849,6 +2849,17 @@ class projectModel extends model
         $this->lang->project->menuOrder   = $this->lang->$navGroup->menuOrder;
         $this->lang->project->dividerMenu = $this->lang->$navGroup->dividerMenu;
 
+        if(empty($project->hasProduct))
+        {
+            unset($this->lang->project->menu->settings['subMenu']->products);
+        }
+        else
+        {
+            unset($this->lang->project->menu->settings['subMenu']->module);
+            unset($this->lang->project->menu->settings['subMenu']->managerepo);
+            unset($this->lang->project->menu->projectplan);
+        }
+
         $this->loadModel('common')->resetProjectPriv($projectID);
     }
 

From 69bd73c271391558687d7030b0baafc261ed638e Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 15:04:22 +0800
Subject: [PATCH 54/60] * finish task #76338

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

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 932f64e203..77767bbee6 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -9,6 +9,7 @@
  * @version     $Id: view.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
@@ -161,7 +162,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 zget($project, 'model') != 'scrum') echo 'hide'?>'>
+                <tr valign='middle' class='<?php if(!($product->shadow and zget($project, 'model') == 'scrum' and $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 cd7a5fd3906135e2287122d39e41eebbb689a395 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Tue, 15 Nov 2022 15:12:15 +0800
Subject: [PATCH 55/60] * Fix bug #29725.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 50b7d6892f..6d5f75f0c4 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -180,7 +180,7 @@ class execution extends control
 
         /* Save to session. */
         $uri = $this->app->getURI(true);
-        $this->app->session->set('taskList', $uri, 'execution');
+        $this->app->session->set('taskList', $uri . "#app={$this->app->tab}", 'execution');
 
         /* Process the order by field. */
         if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_desc';

From 0e6c9a88d3e4686577688a2b3e4e3997414fd974 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 15:23:49 +0800
Subject: [PATCH 56/60] * finish task #76330

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 50b7d6892f..7e5db92d26 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1844,7 +1844,7 @@ class execution extends control
         $this->view->code                = $code;
         $this->view->team                = $team;
         $this->view->teams               = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
-        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
+        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed|multiple');
         $this->view->copyProjects        = $copyProjects;
         $this->view->copyExecutions      = array('' => '') + $this->execution->getList($copyProjectID);
         $this->view->executionID         = $executionID;

From df7841c7b7455d4089797d166bb4ba6f82a76fef Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 15 Nov 2022 15:50:05 +0800
Subject: [PATCH 57/60] * finish task #75920

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index cbab8e4866..88c6ecc9d7 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -254,6 +254,7 @@
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
               if($value->show)
               {
                   $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
@@ -273,6 +274,7 @@
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
               $this->story->printCell($value, $story, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType, $execution, $showBranch);
           }
           ?>
@@ -288,6 +290,7 @@
           {
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'plan') continue;
               if(!$execution->hasProduct and !$execution->multiple and $value->id == 'stage') continue;
+              if(!$execution->hasProduct and !$execution->multiple and $storyType == 'requirement' and $value->id == 'taskCount') continue;
               $this->story->printCell($value, $child, $users, $branchOption, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType, $execution);
           }?>
           </tr>

From 85c8e84c7910c30f535a45ce0d47e26df6fe8c2f Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 15 Nov 2022 15:56:34 +0800
Subject: [PATCH 58/60] * Fix bug#29808.

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

diff --git a/module/tree/control.php b/module/tree/control.php
index 769bc0a4f6..1041211554 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -400,15 +400,16 @@ class tree extends control
         $this->view->branch = $branch;
         $this->view->users  = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);
 
-        $showProduct             = strpos('story|bug|case', $type) !== false ? true : false;
-        $this->view->showProduct = $showProduct;
+        $showProduct = strpos('story|bug|case', $type) !== false ? true : false;
         if($showProduct)
         {
             $product = $this->loadModel('product')->getById($module->root);
             if($product->type != 'normal') $this->view->branches = $this->loadModel('branch')->getPairs($module->root, 'withClosed');
             $this->view->product  = $product;
             $this->view->products = $this->product->getPairs('', $product->program);
+            if($product->shadow) $showProduct = false;
         }
+        $this->view->showProduct = $showProduct;
 
         /* Remove self and childs from the $optionMenu. Because it's parent can't be self or childs. */
         $childs = $this->tree->getAllChildId($moduleID);

From 13c945cd073cc28af10bfb195334863e3136c2bc Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Tue, 15 Nov 2022 08:26:11 +0000
Subject: [PATCH 59/60] * Adjust code feedback #1422.

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

diff --git a/module/branch/model.php b/module/branch/model.php
index 47bbc4f4ed..5c62d826d8 100644
--- a/module/branch/model.php
+++ b/module/branch/model.php
@@ -126,7 +126,7 @@ class branchModel extends model
 
         if($executionID)
         {
-            $branches = array('0' => $this->lang->branch->main, 'all' => $this->lang->branch->all) + $branches;
+            $branches = array('all' => $this->lang->branch->all, '0' => $this->lang->branch->main) + $branches;
             return $branches;
         }
 

From cc12e457555fda0eb52c217292062c48bca9f010 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 15 Nov 2022 08:26:43 +0000
Subject: [PATCH 60/60] g * Adjust import release list.

---
 module/kanban/css/importrelease.css       |  2 ++
 module/kanban/view/importrelease.html.php | 32 ++++++++++++++---------
 module/release/lang/de.php                |  2 ++
 module/release/lang/en.php                |  2 ++
 module/release/lang/fr.php                |  2 ++
 module/release/lang/zh-cn.php             |  2 ++
 module/release/view/browse.html.php       |  4 +--
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 module/kanban/css/importrelease.css

diff --git a/module/kanban/css/importrelease.css b/module/kanban/css/importrelease.css
new file mode 100644
index 0000000000..d0ac33b985
--- /dev/null
+++ b/module/kanban/css/importrelease.css
@@ -0,0 +1,2 @@
+#releaseList > tbody > tr:hover{background-color: unset!important;}
+#product_chosen {width: 45% !important}
diff --git a/module/kanban/view/importrelease.html.php b/module/kanban/view/importrelease.html.php
index c8e5bf342a..16f838c13f 100644
--- a/module/kanban/view/importrelease.html.php
+++ b/module/kanban/view/importrelease.html.php
@@ -33,7 +33,7 @@
   </div>
   <?php if($releases2Imported):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='importReleaseForm'>
-    <table class='table table-fixed' id='releaseList'>
+    <table class='table table-bordered table-fixed' id='releaseList'>
       <thead>
         <tr>
           <th class="c-id">
@@ -43,32 +43,41 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->release->name;?></th>
-          <th class='c-name'><?php echo $lang->release->project;?></th>
-          <th class='c-name'><?php echo $lang->release->build;?></th>
+          <th class='c-name'><?php echo $lang->release->includedBuild;?></th>
+          <th class='c-name'><?php echo $lang->release->relatedProject;?></th>
           <th class='c-date'><?php echo $lang->release->date;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach($releases2Imported as $release):?>
+        <?php $i = 1;?>
+        <?php $buildCount = count($release->builds);?>
+        <?php foreach($release->builds as $build):?>
         <tr>
-          <td class='c-id'>
+          <?php if($i == 1):?>
+          <td rowspan="<?php echo $buildCount;?>" class='c-id'>
             <div class="checkbox-primary">
               <input type='checkbox' name='releases[]' value='<?php echo $release->id;?>'/>
               <label></label>
             </div>
             <?php printf('%03d', $release->id);?>
           </td>
-          <?php if(common::hasPriv('release', 'view')):?>
-          <td title='<?php echo $release->name;?>'>
+          <td rowspan="<?php echo $buildCount;?>" title='<?php echo $release->name;?>'>
+            <?php if(common::hasPriv('release', 'view')):?>
             <a href='javascript:void(0);' onclick="locateView('release', <?php echo $release->id;?>)"><?php echo $release->name;?></a>
+            <?php else:?>
+            <?php echo $release->name;?>
+            <?php endif;?>
           </td>
-          <?php else:?>
-          <td title='<?php echo $release->name;?>'><?php echo $release->name;?></td>
           <?php endif;?>
-          <td title='<?php echo $release->projectName;?>'><?php echo $release->projectName;?></td>
-          <td title='<?php echo $release->buildName;?>'><?php echo $release->buildName;?></td>
-          <td title='<?php echo $release->date;?>'><?php echo $release->date;?></td>
+          <td title='<?php echo $build->name;?>'><?php echo $build->name;?></td>
+          <td title='<?php echo $build->projectName;?>'><?php echo $build->projectName;?></td>
+          <?php if($i == 1):?>
+          <td rowspan="<?php echo $buildCount;?>" title='<?php echo $release->date;?>'><?php echo $release->date;?></td>
+          <?php endif;?>
         </tr>
+        <?php $i++;?>
+        <?php endforeach;?>
         <?php endforeach;?>
         <tr><?php echo html::hidden('targetLane', key($lanePairs));?></tr>
       </tbody>
@@ -83,5 +92,4 @@
   <div class='table-empty-tip'><?php echo $lang->noData;?></div>
   <?php endif;?>
 </div>
-<style>#product_chosen {width: 45% !important}</style>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 5b9df0f6a5..81723c68b5 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -38,6 +38,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Meilensteine';
 $lang->release->date           = 'Datum';
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 14f54db539..c480cbd021 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -39,6 +39,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Milestone';
 $lang->release->date           = 'Release Date';
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 1f5dbdf9e1..c27bfe6121 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -38,6 +38,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Plateforme/Branche';
 $lang->release->project        = 'Project';
 $lang->release->build          = 'Build';
+$lang->release->includedBuild  = 'Included Build';
+$lang->release->relatedProject = 'Related Project';
 $lang->release->name           = 'Nom';
 $lang->release->marker         = 'Etape Importante';
 $lang->release->date           = 'Date Release';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 6689db4489..57af6338f2 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -39,6 +39,8 @@ $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = '平台/分支';
 $lang->release->project        = '所属项目';
 $lang->release->build          = '版本';
+$lang->release->includedBuild  = '包含版本';
+$lang->release->relatedProject = '对应项目';
 $lang->release->name           = '发布名称';
 $lang->release->marker         = '里程碑';
 $lang->release->date           = '发布日期';
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 3162da013b..b78e2b51fc 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -51,8 +51,8 @@
       <tr>
         <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
-        <th class='text-center c-build'><?php echo $lang->release->build;?></th>
-        <th class='text-center c-project'><?php echo $lang->release->project;?></th>
+        <th class='text-center c-build'><?php echo $lang->release->includedBuild;?></th>
+        <th class='text-center c-project'><?php echo $lang->release->relatedProject;?></th>
         <th class='text-center c-status'><?php echo $lang->release->status;?></th>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <?php