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() datatable->showModule;?> datatable->showModuleList, isset($config->datatable->$datatableId->showModule) ? $config->datatable->$datatableId->showModule : '');?> - moduleName == 'execution' && $app->methodName == 'task'):?> + moduleName == 'execution' and $app->methodName == 'task'):?> datatable->showAllModule;?> datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?> - moduleName == 'product' && $app->methodName == 'browse'):?> + app->tab == 'product' and $app->moduleName == 'product' and $app->methodName == 'browse'):?> datatable->showBranch;?> datatable->showBranchList, isset($config->product->browse->showBranch) ? $config->product->browse->showBranch : 1);?> 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;} app->rawModule);?> -type);?> +app->tab == 'product' ? $product->type : '');?> product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array(); $unfoldStories = zget($unfoldStories, $productID, array());