From 766d166a5b9d14cf72c383a314dfaa5ce96dba8b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 25 Aug 2022 14:46:07 +0800
Subject: [PATCH 1/4] * Fix bug #26879.

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

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index cf0718f6ab..d8ddeac626 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -288,10 +288,10 @@
                 <td><?php echo html::select('duplicateStory', $productStories, $story->duplicateStory, 'class="form-control"'); ?></td>
               </tr>
               <tr class='text-top'>
-                <th class='thWidth'><?php echo $lang->story->linkStory;?></th>
+                <th class='thWidth'><?php echo $story->type == 'story' ? $lang->requirement->linkStory : $lang->story->linkStory;?></th>
                 <td>
                   <?php if(common::hasPriv('story', 'linkStories') and $story->type == 'story') echo html::a("#", $lang->story->linkStoriesAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
-                  <?php if(common::hasPriv('story', 'linkRequirements') and $story->type == 'requirement') echo html::a("#", $lang->story->linkRequirementsAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
+                  <?php if(common::hasPriv('requirement', 'linkRequirements') and $story->type == 'requirement') echo html::a("#", $lang->story->linkRequirementsAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
                 </td>
               </tr>
               <tr>

From 704de14c419ae8bff7a5934ba8270f5b89f73513 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 25 Aug 2022 15:22:56 +0800
Subject: [PATCH 2/4] * Fix bug #26880.

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

diff --git a/module/product/model.php b/module/product/model.php
index f953febae7..84d41ea26e 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1077,7 +1077,7 @@ class productModel extends model
                 $modules          = array();
                 $branchList       = $this->loadModel('branch')->getPairs($productID, '', $projectID);
                 $branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
-                foreach($branchModuleList as $branchID => $branchModules) $modules[] = $branchModules;
+                foreach($branchModuleList as $branchID => $branchModules) $modules = array_merge($modules, $branchModules);
             }
             else
             {

From ad240eab6171c76248ef9da18b58d50771b5c123 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 25 Aug 2022 15:28:47 +0800
Subject: [PATCH 3/4] * Fix bug #26889.

---
 module/execution/config.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index 10694f9e4f..163e64c818 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -179,10 +179,13 @@ if(!isset($config->setCode) or $config->setCode == 1)
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
-else
+elseif($config->systemMode == 'new')
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
+{
+    $config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+}
 
 $config->execution->datatable->fieldList['id']['title']    = 'idAB';
 $config->execution->datatable->fieldList['id']['fixed']    = 'left';
@@ -202,10 +205,13 @@ if(!isset($config->setCode) or $config->setCode == 1)
     $config->execution->datatable->fieldList['code']['required'] = 'no';
 }
 
-$config->execution->datatable->fieldList['project']['title']    = 'project';
-$config->execution->datatable->fieldList['project']['fixed']    = 'no';
-$config->execution->datatable->fieldList['project']['width']    = '100';
-$config->execution->datatable->fieldList['project']['required'] = 'no';
+if($config->systemMode == 'new')
+{
+    $config->execution->datatable->fieldList['project']['title']    = 'project';
+    $config->execution->datatable->fieldList['project']['fixed']    = 'no';
+    $config->execution->datatable->fieldList['project']['width']    = '100';
+    $config->execution->datatable->fieldList['project']['required'] = 'no';
+}
 
 $config->execution->datatable->fieldList['PM']['title']    = 'owner';
 $config->execution->datatable->fieldList['PM']['fixed']    = 'no';

From db036c91721f5e4c7374ea7dd78271632abfa1cb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 25 Aug 2022 15:31:31 +0800
Subject: [PATCH 4/4] * Fix bug #26879.

---
 module/execution/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/config.php b/module/execution/config.php
index 163e64c818..ae894c97ea 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -183,6 +183,7 @@ elseif($config->systemMode == 'new')
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
+else
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }