From a77510b311e62003a0f74fb303459cec37a6ce11 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 29 Nov 2021 15:11:16 +0800
Subject: [PATCH 1/7] * Finish task #44987,44988,44989.

---
 module/common/view/datatable.fix.html.php |  7 +++--
 module/execution/control.php              | 33 ++++++++++++++++++++---
 module/execution/view/story.html.php      |  3 ++-
 module/task/model.php                     |  3 ++-
 module/testcase/model.php                 |  9 ++++++-
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index cf7801bc0b..f98e6ed15b 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,5 +1,5 @@
-<?php $currentModule = $this->moduleName;?>
-<?php $currentMethod = $this->methodName;?>
+<?php $currentModule = $this->app->rawModule;?>
+<?php $currentMethod = $this->app->rawMethod;?>
 <?php $datatableId   = $this->moduleName . ucfirst($this->methodName);?>
 
 <style>
@@ -46,7 +46,6 @@ $(function()
         var allModule  = $('#showModuleModal input[name="showAllModule"]:checked').val();
         var showBranch = $('#showModuleModal input[name="showBranch"]:checked').val();
         if(typeof allModule  === 'undefined') allModule  = false;
-        if(typeof showBranch === 'undefined') showBranch = false;
         $.ajax(
         {
             type: "POST",
@@ -105,7 +104,7 @@ $(function()
               <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>
             </tr>
             <?php endif;?>
-            <?php if(!empty($product) and $product->type != 'normal' and ($this->app->tab == 'product' or $this->app->tab == 'qa')):?>
+            <?php if(!isset($product) or !empty($product) and $product->type != 'normal'):?>
             <tr>
               <td><?php echo $lang->datatable->showBranch;?></td>
               <td><?php echo html::radio('showBranch', $lang->datatable->showBranchList, isset($config->$currentModule->$currentMethod->showBranch) ? $config->$currentModule->$currentMethod->showBranch : 1);?></td>
diff --git a/module/execution/control.php b/module/execution/control.php
index ad7086de69..c5df21c1e7 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -137,6 +137,7 @@ class execution extends control
         $this->loadModel('task');
         $this->loadModel('datatable');
         $this->loadModel('setting');
+        $this->loadModel('product');
 
         if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
@@ -148,7 +149,7 @@ class execution extends control
         /* Get products by execution. */
         $execution   = $this->commonAction($executionID, $status);
         $executionID = $execution->id;
-        $products    = $this->loadModel('product')->getProductPairsByProject($executionID);
+        $products    = $this->product->getProductPairsByProject($executionID);
         setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
         /* Save the recently five executions visited in the cookie. */
@@ -216,6 +217,12 @@ class execution extends control
             $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         }
 
+        $product = $this->product->getById($productID);
+        if(!empty($product) and $product->type != 'normal')
+        {
+            $lang->datatable->showBranch = sprintf($lang->datatable->showBranch, $lang->product->branchName[$product->type]);
+        }
+
         /* Build the search form. */
         $actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch&param=myQueryID");
         $this->config->execution->search['onMenuBar'] = 'yes';
@@ -245,6 +252,7 @@ class execution extends control
         $this->view->executionID  = $executionID;
         $this->view->execution    = $execution;
         $this->view->productID    = $productID;
+        $this->view->product      = $product;
         $this->view->modules      = $this->tree->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
         $this->view->moduleID     = $moduleID;
         $this->view->moduleTree   = $this->tree->getTaskTreeMenu($executionID, $productID, $startModuleID = 0, array('treeModel', 'createTaskLink'), $extra);
@@ -671,6 +679,7 @@ class execution extends control
         $this->loadModel('story');
         $this->loadModel('user');
         $this->loadModel('datatable');
+        $this->app->loadLang('datatable');
         $this->app->loadLang('testcase');
 
         $type      = strtolower($type);
@@ -778,13 +787,31 @@ class execution extends control
             foreach($plans as $plan) $allPlans += $plan;
         }
 
-        if($this->cookie->storyModuleParam)  $this->view->module  = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
-        if($this->cookie->storyProductParam) $this->view->product = $this->loadModel('product')->getById($this->cookie->storyProductParam);
+        if($this->cookie->storyModuleParam)
+        {
+            $modules  = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
+            $this->view->module = $modules;
+
+            $product = $this->product->getById($modules->root);
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+        }
+
+        if($this->cookie->storyProductParam)
+        {
+            $product = $this->loadModel('product')->getById($this->cookie->storyProductParam);
+            $this->view->product = $product;
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+        }
+
         if($this->cookie->storyBranchParam)
         {
             $branchID = $this->cookie->storyBranchParam;
             if(strpos($branchID, ',') !== false) list($productID, $branchID) = explode(',', $branchID);
             $this->view->branch  = $this->loadModel('branch')->getById($branchID, $productID);
+
+            $product = $this->loadModel('product')->getById($productID);
+            $productType = $this->branch->getProductType($branchID);
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[!empty($product) ? $product->type : $productType]);
         }
 
         /* Get execution's product. */
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 5361f817f5..0f9f4c76f9 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -220,7 +220,8 @@
             <?php endif;?>
             <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
             <td class='c-name' title="<?php echo $story->title?>">
-              <?php if(isset($branchGroups[$story->product][$story->branch])) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
+              <?php $showBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;?>
+              <?php if(isset($branchGroups[$story->product][$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
               <?php if(!empty($story->module) and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";?>
               <?php if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";?>
               <?php echo html::a($storyLink,$story->title, null, "style='color: $story->color' data-app='execution'");?>
diff --git a/module/task/model.php b/module/task/model.php
index 5be7174d2b..4eff098038 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3026,8 +3026,9 @@ class taskModel extends model
                 echo "</span>";
                 break;
             case 'name':
+                $showBranch = isset($this->config->execution->task->showBranch) ? $this->config->execution->task->showBranch : 1;
                 if($task->parent > 0 and isset($task->parentName)) $task->name = "{$task->parentName} / {$task->name}";
-                if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-outline'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
+                if(!empty($task->product) and isset($branchGroups[$task->product][$task->branch]) and $showBranch) echo "<span class='label label-info label-outline'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
                 if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-gray label-badge'>" . $modulePairs[$task->module] . '</span> ';
                 if($task->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
                 if(!empty($task->team)) echo '<span class="label label-badge label-light" title="' . $this->lang->task->multiple . '">' . $this->lang->task->multipleAB . '</span> ';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 48ab2ff493..de214cfa75 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1550,7 +1550,14 @@ class testcaseModel extends model
                 echo "</span>";
                 break;
             case 'title':
-                $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
+                if($this->app->tab == 'project')
+                {
+                    $showBranch = isset($this->config->project->testcase->showBranch) ? $this->config->project->testcase->showBranch : 1;
+                }
+                else
+                {
+                    $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
+                } 
                 if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
                 echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";

From fea372ea26efdcaee9e6d742429aeeee57662529 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 29 Nov 2021 15:45:56 +0800
Subject: [PATCH 2/7] * Finish task #44987,44988,44989.

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

diff --git a/module/story/model.php b/module/story/model.php
index c81aeb462c..f38e087f5b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3717,7 +3717,14 @@ class storyModel extends model
                 echo "</span>";
                 break;
             case 'title':
-                $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
+                if($this->app->tab == 'project')
+                {
+                    $showBranch = isset($this->config->projectstory->story->showBranch) ? $this->config->projectstory->story->showBranch : 1;
+                }
+                else
+                {
+                    $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
+                }
                 if($storyType == 'requirement') echo '<span class="label label-badge label-light">SR</span> ';
                 if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}";
                 if(isset($branches[$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";

From 7a5c0629470375a52042f98c67db5e2a44120dea Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 29 Nov 2021 16:15:50 +0800
Subject: [PATCH 3/7] * Finish task #44987,44988,44989.

---
 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 c5df21c1e7..4a8f99f8b6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -220,7 +220,7 @@ class execution extends control
         $product = $this->product->getById($productID);
         if(!empty($product) and $product->type != 'normal')
         {
-            $lang->datatable->showBranch = sprintf($lang->datatable->showBranch, $lang->product->branchName[$product->type]);
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
         }
 
         /* Build the search form. */

From 19d489a645af8596ce62bf3f4b99c7a9fd0f074e Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Tue, 30 Nov 2021 09:27:50 +0800
Subject: [PATCH 4/7] * Fix bug #44987,44988,44989.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 4a8f99f8b6..69c33e1b95 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -217,7 +217,8 @@ class execution extends control
             $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         }
 
-        $product = $this->product->getById($productID);
+        $productModules = $this->tree->getById($moduleID);
+        $product = $this->product->getById(!empty($productID) ? $productID : (!empty($productModules) ? $productModules->root : 0));
         if(!empty($product) and $product->type != 'normal')
         {
             $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
@@ -808,10 +809,6 @@ class execution extends control
             $branchID = $this->cookie->storyBranchParam;
             if(strpos($branchID, ',') !== false) list($productID, $branchID) = explode(',', $branchID);
             $this->view->branch  = $this->loadModel('branch')->getById($branchID, $productID);
-
-            $product = $this->loadModel('product')->getById($productID);
-            $productType = $this->branch->getProductType($branchID);
-            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[!empty($product) ? $product->type : $productType]);
         }
 
         /* Get execution's product. */

From d89aa24c8cd582d6210c01713c485b40805f20c5 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Tue, 30 Nov 2021 10:32:11 +0800
Subject: [PATCH 5/7] * Finish task #44987,44988,44989.

---
 module/common/view/datatable.fix.html.php |  2 +-
 module/execution/control.php              | 14 +++++++++-----
 module/execution/view/task.html.php       |  1 -
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index f98e6ed15b..33a4c28c46 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -104,7 +104,7 @@ $(function()
               <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>
             </tr>
             <?php endif;?>
-            <?php if(!isset($product) or !empty($product) and $product->type != 'normal'):?>
+            <?php if(!empty($product) and $product->type != 'normal'):?>
             <tr>
               <td><?php echo $lang->datatable->showBranch;?></td>
               <td><?php echo html::radio('showBranch', $lang->datatable->showBranchList, isset($config->$currentModule->$currentMethod->showBranch) ? $config->$currentModule->$currentMethod->showBranch : 1);?></td>
diff --git a/module/execution/control.php b/module/execution/control.php
index 69c33e1b95..4da2e2df62 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -217,8 +217,12 @@ class execution extends control
             $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         }
 
-        $productModules = $this->tree->getById($moduleID);
-        $product = $this->product->getById(!empty($productID) ? $productID : (!empty($productModules) ? $productModules->root : 0));
+        $product = $this->product->getById($productID);
+        if(empty($productID))
+        {
+            $productModule = $this->tree->getById($moduleID);
+            $product       = $this->product->getById((!empty($productModule) ? $productModule->root : 0));
+        }
         if(!empty($product) and $product->type != 'normal')
         {
             $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
@@ -790,10 +794,10 @@ class execution extends control
 
         if($this->cookie->storyModuleParam)
         {
-            $modules  = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
-            $this->view->module = $modules;
+            $module = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
+            $this->view->module = $module;
 
-            $product = $this->product->getById($modules->root);
+            $product = $this->product->getById($module->root);
             $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
         }
 
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 6da2ab904f..b8254cc885 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -37,7 +37,6 @@ body {margin-bottom: 25px;}
   <?php
   if(!empty($productID))
   {
-      $product    = $this->product->getById($productID);
       $removeLink = $browseType == 'byproduct' ? inlink('task', "executionID=$executionID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
       $moduleName = $product->name;
       $html       = $moduleName . html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");

From f2d867870aaeb621181eab66ced8de03c5954526 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Tue, 30 Nov 2021 10:55:41 +0800
Subject: [PATCH 6/7] * Finish task #44987,44988,44989.

---
 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 4da2e2df62..1f55f079df 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -221,7 +221,7 @@ class execution extends control
         if(empty($productID))
         {
             $productModule = $this->tree->getById($moduleID);
-            $product       = $this->product->getById((!empty($productModule) ? $productModule->root : 0));
+            if(!empty($productModule) and $productModule->type != 'task') $product = $this->product->getById($productModule->root);
         }
         if(!empty($product) and $product->type != 'normal')
         {

From 71387b1d372508211124ced82ed418e2841d25be Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Tue, 30 Nov 2021 11:26:48 +0800
Subject: [PATCH 7/7] * Finish task #44987,44988,44989.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index 1f55f079df..c6df8004bd 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -217,12 +217,14 @@ class execution extends control
             $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         }
 
-        $product = $this->product->getById($productID);
+        /* Get product. */
         if(empty($productID))
         {
             $productModule = $this->tree->getById($moduleID);
             if(!empty($productModule) and $productModule->type != 'task') $product = $this->product->getById($productModule->root);
         }
+        if(empty($product)) $product = $this->product->getById($productID);
+
         if(!empty($product) and $product->type != 'normal')
         {
             $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);