From 7247a7d4b535768d478fb76a4a416d9040a12a33 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 10 Nov 2021 11:13:37 +0800 Subject: [PATCH] * Finish task #43892. --- module/common/view/datatable.fix.html.php | 21 +++++++++++++++------ module/datatable/control.php | 1 + module/datatable/lang/en.php | 4 ++++ module/datatable/lang/zh-cn.php | 4 ++++ module/story/model.php | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index fbb3031a4e..14cd957edc 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -6,7 +6,7 @@ $(function() { - $('#sidebar .cell .text-center:last').append("datatable->moduleSetting?>
"); + $('#sidebar .cell .text-center:last').append("moduleName=='product' ? $lang->datatable->listSetting : $lang->datatable->moduleSetting?>
"); var addSettingButton = function() @@ -36,10 +36,12 @@ $(function() $('#setShowModule').click(function() { if('app->user->account?>' == 'guest') return; - datatableId = ''; - var value = $('#showModuleModal input[name="showModule"]:checked').val(); - var allModule = $('#showModuleModal input[name="showAllModule"]:checked').val(); - if(typeof allModule === 'undefined') allModule = false; + datatableId = ''; + var value = $('#showModuleModal input[name="showModule"]:checked').val(); + 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", @@ -50,6 +52,7 @@ $(function() name: 'showModule', value: value, allModule: allModule, + showBranch: showBranch, }, success:function(){window.location.reload();}, url: 'createLink('datatable', 'ajaxSave')?>' @@ -80,7 +83,7 @@ $(function()
-

datatable->moduleSetting;?>

+

moduleName=='product' ? $lang->datatable->listSetting : $lang->datatable->moduleSetting;?>

'> @@ -95,6 +98,12 @@ $(function() datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?> + moduleName == 'product' && $app->methodName == 'browse'):?> + + datatable->showBranch;?> + datatable->showBranchList, isset($config->product->browse->showBranch) ? $config->product->browse->showBranch : 1);?> + + diff --git a/module/datatable/control.php b/module/datatable/control.php index 1c2ef4cc0e..76c526121f 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -38,6 +38,7 @@ class datatable extends control $name = 'datatable.' . $this->post->target . '.' . $this->post->name; $this->loadModel('setting')->setItem($account . '.' . $name, $this->post->value); if($this->post->allModule !== false) $this->setting->setItem("$account.execution.task.allModule", $this->post->allModule); + if($this->post->showBranch !== false) $this->setting->setItem("$account.product.browse.showBranch", $this->post->showBranch); if($this->post->global) $this->setting->setItem('system.' . $name, $this->post->value); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => 'dao error.')); diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index a2253f5f34..93d550dbd4 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -19,10 +19,14 @@ $lang->datatable->branch = 'Branch'; $lang->datatable->platform = 'Platform'; $lang->datatable->moduleSetting = 'Set Module'; +$lang->datatable->listSetting = 'Set list'; $lang->datatable->showModule = 'Show modules in the list'; +$lang->datatable->showBranch = 'Show branches in the list'; $lang->datatable->showAllModule = 'Show product modules'; $lang->datatable->showModuleList[] = 'N/A'; $lang->datatable->showModuleList['base'] = 'Base Node'; $lang->datatable->showModuleList['end'] = 'End Node'; $lang->datatable->showAllModuleList[0] = 'Hide'; $lang->datatable->showAllModuleList[1] = 'Show'; +$lang->datatable->showBranchList[0] = 'Hide'; +$lang->datatable->showBranchList[1] = 'Show'; diff --git a/module/datatable/lang/zh-cn.php b/module/datatable/lang/zh-cn.php index 6b7a4573c8..81cd44b83c 100644 --- a/module/datatable/lang/zh-cn.php +++ b/module/datatable/lang/zh-cn.php @@ -19,10 +19,14 @@ $lang->datatable->branch = '分支'; $lang->datatable->platform = '平台'; $lang->datatable->moduleSetting = '模块设置'; +$lang->datatable->listSetting = '列表设置'; $lang->datatable->showModule = '列表页是否显示模块名'; +$lang->datatable->showBranch = '列表页是否显示分支名'; $lang->datatable->showAllModule = '是否显示完整产品模块'; $lang->datatable->showModuleList[] = '不显示'; $lang->datatable->showModuleList['base'] = '只显示一级模块'; $lang->datatable->showModuleList['end'] = '只显示最后一级模块'; $lang->datatable->showAllModuleList[0] = '不显示'; $lang->datatable->showAllModuleList[1] = '显示'; +$lang->datatable->showBranchList[0] = '不显示'; +$lang->datatable->showBranchList[1] = '显示'; diff --git a/module/story/model.php b/module/story/model.php index 186f2642d6..9cf323eb29 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3663,7 +3663,7 @@ class storyModel extends model case 'title': if($storyType == 'requirement') echo 'SR '; if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}"; - if($story->branch and isset($branches[$story->branch])) echo "{$branches[$story->branch]} "; + if($story->branch and isset($branches[$story->branch]) and !empty($this->config->product->browse->showBranch)) echo "{$branches[$story->branch]} "; if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} "; if($story->parent > 0) echo '' . $this->lang->story->childrenAB . ' '; echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-app='$tab'") : "{$story->title}";