From c9996a26eca445183f6fb708a3c298539d7a4e58 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 11 Nov 2021 15:54:22 +0800
Subject: [PATCH] * Fix bug #16191.

---
 module/common/view/datatable.fix.html.php | 4 ++--
 module/product/view/browse.html.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 14cd957edc..59b8a22120 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -92,13 +92,13 @@ $(function()
               <td class='w-150px'><?php echo $lang->datatable->showModule;?></td>
               <td><?php echo html::radio('showModule', $lang->datatable->showModuleList, isset($config->datatable->$datatableId->showModule) ? $config->datatable->$datatableId->showModule : '');?></td>
             </tr>
-            <?php if($app->moduleName == 'execution' && $app->methodName == 'task'):?>
+            <?php if($app->moduleName == 'execution' and $app->methodName == 'task'):?>
             <tr>
               <td><?php echo $lang->datatable->showAllModule;?></td>
               <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($app->moduleName == 'product' && $app->methodName == 'browse'):?>
+            <?php if($this->app->tab == 'product' and $app->moduleName == 'product' and $app->methodName == 'browse'):?>
             <tr>
               <td><?php echo $lang->datatable->showBranch;?></td>
               <td><?php echo html::radio('showBranch', $lang->datatable->showBranchList, isset($config->product->browse->showBranch) ? $config->product->browse->showBranch : 1);?></td>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 3f1668a8c8..a81e38a755 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -23,7 +23,7 @@ body {margin-bottom: 25px;}
 <?php js::set('projectID', $projectID);?>
 <?php js::set('branch', $branch);?>
 <?php js::set('rawModule', $this->app->rawModule);?>
-<?php js::set('productType', $product->type);?>
+<?php js::set('productType', $this->app->tab == 'product' ? $product->type : '');?>
 <?php
 $unfoldStories = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array();
 $unfoldStories = zget($unfoldStories, $productID, array());