From 8b8c4fe18009562e5665b0da1304f27b29b313cb Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 17 Nov 2021 09:30:34 +0800
Subject: [PATCH] * Finish task #44493,44494.

---
 module/bug/control.php                    | 3 +--
 module/bug/model.php                      | 4 ++--
 module/bug/view/browse.html.php           | 2 +-
 module/common/view/datatable.fix.html.php | 2 +-
 module/product/control.php                | 6 +++---
 module/product/view/browse.html.php       | 2 +-
 module/story/model.php                    | 4 ++--
 module/testcase/control.php               | 6 +++---
 module/testcase/model.php                 | 4 ++--
 module/testcase/view/browse.html.php      | 2 +-
 10 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 920fa963d6..e02a65af7b 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -238,7 +238,7 @@ class bug extends control
         $this->view->moduleID        = $moduleID;
         $this->view->memberPairs     = $this->user->getPairs('noletter|nodeleted');
         $this->view->branch          = $branch;
-        $this->view->branches        = $this->loadModel('branch')->getPairs($productID);
+        $this->view->branches        = $showBranch ? $this->loadModel('branch')->getPairs($productID) : array();
         $this->view->executions      = $executions;
         $this->view->plans           = $this->loadModel('productplan')->getPairs($productID);
         $this->view->stories         = $storyList;
@@ -246,7 +246,6 @@ class bug extends control
         $this->view->setModule       = true;
         $this->view->isProjectBug    = ($productID and !$this->projectID) ? false : true;
         $this->view->modulePairs     = $showModule ? $this->tree->getModulePairs($productID, 'bug', $showModule) : array();
-        $this->view->showBranch      = $showBranch;
 
         $this->display();
     }
diff --git a/module/bug/model.php b/module/bug/model.php
index cc0f36232b..9e8fdd185a 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2648,7 +2648,7 @@ class bugModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $bug, $users, $builds, $branches, $modulePairs, $executions = array(), $plans = array(), $stories = array(), $tasks = array(), $mode = 'datatable', $showBranch = '')
+    public function printCell($col, $bug, $users, $builds, $branches, $modulePairs, $executions = array(), $plans = array(), $stories = array(), $tasks = array(), $mode = 'datatable')
     {
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('bug', $bug);
@@ -2751,7 +2751,7 @@ class bugModel extends model
                 echo "<span class='$class'>" . zget($this->lang->bug->confirmedList, $bug->confirmed, $bug->confirmed) . "</span> ";
                 break;
             case 'title':
-                if($bug->branch and isset($branches[$bug->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$bug->branch]}</span> ";
+                if($bug->branch and isset($branches[$bug->branch])) echo "<span class='label label-outline label-badge'>{$branches[$bug->branch]}</span> ";
                 if($bug->module and isset($modulePairs[$bug->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$bug->module]}</span> ";
                 echo $canView ? html::a($bugLink, $bug->title, null, "style='color: $bug->color'") : "<span style='color: $bug->color'>{$bug->title}</span>";
                 break;
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 0538e2f3e6..b32720fd99 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -264,7 +264,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         <tbody>
           <?php foreach($bugs as $bug):?>
           <tr data-id='<?php echo $bug->id?>'>
-            <?php foreach($setting as $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table', $showBranch);?>
+            <?php foreach($setting as $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?>
           </tr>
           <?php endforeach;?>
         </tbody>
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 22ace63748..fa7c745e7f 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,6 +1,6 @@
 <?php $currentModule = $this->moduleName;?>
 <?php $currentMethod = $this->methodName;?>
-<?php $datatableId = $currentModule . ucfirst($this->methodName);?>
+<?php $datatableId   = $this->moduleName . ucfirst($this->methodName);?>
 
 <style>
 #setShowModule {margin-left: 30px;}
diff --git a/module/product/control.php b/module/product/control.php
index b7d627f633..5b34bdacc1 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -270,10 +270,9 @@ class product extends control
 
         $this->config->product->search['onMenuBar'] = 'yes';
         $this->product->buildSearchForm($productID, $this->products, $queryID, $actionURL);
+
         $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
-        $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
         $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
-        $this->view->showBranch  = $showBranch;
 
         $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID];
 
@@ -299,7 +298,7 @@ class product extends control
         $this->view->moduleID        = $moduleID;
         $this->view->moduleName      = ($moduleID and $moduleID !== 'all') ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
         $this->view->branch          = $branch;
-        $this->view->branches        = $this->loadModel('branch')->getPairs($productID);
+        $this->view->branches        = $showBranch ? $this->loadModel('branch')->getPairs($productID) : array();
         $this->view->storyStages     = $this->product->batchGetStoryStage($stories);
         $this->view->setModule       = true;
         $this->view->storyTasks      = $storyTasks;
@@ -311,6 +310,7 @@ class product extends control
         $this->view->projectProducts = isset($projectProducts) ? $projectProducts : array();
         $this->view->storyType       = $storyType;
         $this->view->from            = $this->app->tab;
+        $this->view->modulePairs     = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
         $this->display();
     }
 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 0dfef92a4d..2997297c6c 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -313,7 +313,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
           <?php foreach($stories as $story):?>
           <tr data-id='<?php echo $story->id?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
             <?php $story->from = $from;?>
-            <?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType = 'story', $showBranch);?>
+            <?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType = 'story');?>
           </tr>
           <?php if(!empty($story->children)):?>
           <?php $i = 0;?>
diff --git a/module/story/model.php b/module/story/model.php
index 0a34ec6ce1..41e7c58d43 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3610,7 +3610,7 @@ class storyModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $showBranch = '')
+    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story')
     {
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('story', $story);
@@ -3718,7 +3718,7 @@ class storyModel extends model
             case 'title':
                 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> ";
+                if(isset($branches[$story->branch])) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
                 if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
                 if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
                 echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";
diff --git a/module/testcase/control.php b/module/testcase/control.php
index aca496a338..66ceceac1d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -174,8 +174,7 @@ class testcase extends control
         $this->testcase->buildSearchForm($productID, $this->products, $queryID, $actionURL);
 
         $showModule = !empty($this->config->datatable->testcaseBrowse->showModule) ? $this->config->datatable->testcaseBrowse->showModule : '';
-        $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
-        $this->view->showBranch  = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
+        $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
 
         /* Get module tree.*/
         if($projectID and empty($productID))
@@ -215,10 +214,11 @@ class testcase extends control
         $this->view->param         = $param;
         $this->view->cases         = $cases;
         $this->view->branch        = $branch;
-        $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
+        $this->view->branches      = $showBranch ? $this->loadModel('branch')->getPairs($productID) : array();
         $this->view->suiteList     = $this->loadModel('testsuite')->getSuites($productID);
         $this->view->suiteID       = $suiteID;
         $this->view->setModule     = true;
+        $this->view->modulePairs   = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
 
         $this->display();
     }
diff --git a/module/testcase/model.php b/module/testcase/model.php
index a4af76ea1a..ad374b9e53 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1463,7 +1463,7 @@ class testcaseModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable', $showBranch = '')
+    public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable')
     {
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('case', $case);
@@ -1521,7 +1521,7 @@ class testcaseModel extends model
                 echo "</span>";
                 break;
             case 'title':
-                if($case->branch and $showBranch) echo "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
+                if($case->branch) echo "<span class='label label-info label-outline'>{$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>";
                 break;
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 9aa6596dce..beedfee56a 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -111,7 +111,7 @@ js::set('suiteID',        $suiteID);
         <tbody>
           <?php foreach($cases as $case):?>
           <tr data-id='<?php echo $case->id?>'>
-            <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table', $showBranch);?>
+            <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?>
           </tr>
           <?php endforeach;?>
         </tbody>