From 903c858cf139daabbaafcd361e1e5fe1619117b7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 6 Mar 2023 16:36:06 +0800 Subject: [PATCH] * Implement custom use case filter tags. --- module/dev/config.php | 3 +++ module/dev/css/langitem.css | 2 +- module/dev/model.php | 1 + module/project/lang/de.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/fr.php | 2 +- module/project/lang/zh-cn.php | 2 +- module/testcase/lang/de.php | 1 - module/testcase/lang/en.php | 1 - module/testcase/lang/fr.php | 1 - module/testcase/lang/zh-cn.php | 1 - module/testcase/view/caseheader.html.php | 8 ++++---- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/module/dev/config.php b/module/dev/config.php index 387e1e3393..c6c5f439a0 100644 --- a/module/dev/config.php +++ b/module/dev/config.php @@ -295,3 +295,6 @@ if(!helper::hasFeature('meeting')) $config->dev->skipMenus['execution']['me $config->dev->liteTagMethod['my-contribute'] = 'contribute_task'; $config->dev->onlyMainMenu = array('kanban'); + +$config->dev->skipTags['project-testcase'] = array('suite', 'autocase'); +$config->dev->skipTags['testcase-browse'] = array('casetype', 'suite', 'autocase'); diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css index ff8ca82ccd..0feb0d824b 100644 --- a/module/dev/css/langitem.css +++ b/module/dev/css/langitem.css @@ -28,7 +28,7 @@ .form-item-content > .form-item.w-expand {width: 700px;} .form-item-content > .form-item > .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;} .form-item-content > .form-item > .input-group {margin-left: 20px; width:200px; height:32px;} -.form-item-content > .form-item > .input-group > .input-group-addon {flex: 1 1 30%; border-left: 1px solid #dcdcdc;} +.form-item-content > .form-item > .input-group > .input-group-addon {flex: 1 1 30%;} .form-item-content > .form-item > .input-control > input {margin-left: 40px;} .form-item-content > .form-item.active .icon {display: unset;} .form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;} diff --git a/module/dev/model.php b/module/dev/model.php index cb40b4c8ff..9a1dfb64be 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -448,6 +448,7 @@ class devModel extends model foreach($featureBars as $feature => $featureName) { + if(isset($this->config->dev->skipTags["$module-$method"]) and in_array($feature, $this->config->dev->skipTags["$module-$method"])) continue; $moreSelectsTags = isset($defaultLang->{$module}->moreSelects[$method][$feature]) ? $defaultLang->{$module}->moreSelects[$method][$feature] : ''; if($moreSelectsTags) { diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 1e54c68ef3..3073db4a48 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all'] = 'Alle'; $lang->project->featureBar['testcase']['wait'] = 'Wartend'; $lang->project->featureBar['testcase']['needconfirm'] = "Story geändert"; $lang->project->featureBar['testcase']['group'] = 'Group View'; -$lang->project->featureBar['testcase']['zerocase'] = "Zero Case Story"; +$lang->project->featureBar['testcase']['zerocase'] = "Zero Case {$lang->SRCommon}"; $lang->project->featureBar['testcase']['suite'] = 'Suite'; $lang->project->featureBar['testcase']['autocase'] = 'Automated'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b9f2ea7c2f..79d1e6abb9 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all'] = 'All'; $lang->project->featureBar['testcase']['wait'] = 'Waiting'; $lang->project->featureBar['testcase']['needconfirm'] = "Story Changed"; $lang->project->featureBar['testcase']['group'] = 'Group View'; -$lang->project->featureBar['testcase']['zerocase'] = "Zero Case Story"; +$lang->project->featureBar['testcase']['zerocase'] = "Zero Case {$lang->SRCommon}"; $lang->project->featureBar['testcase']['suite'] = 'Suite'; $lang->project->featureBar['testcase']['autocase'] = 'Automated'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index f99f256337..d5edf94f69 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all'] = 'Tous'; $lang->project->featureBar['testcase']['wait'] = 'En Attente'; $lang->project->featureBar['testcase']['needconfirm'] = "Story Changée"; $lang->project->featureBar['testcase']['group'] = 'Group View'; -$lang->project->featureBar['testcase']['zerocase'] = "Zero Case Story"; +$lang->project->featureBar['testcase']['zerocase'] = "Zero Case {$lang->SRCommon}"; $lang->project->featureBar['testcase']['suite'] = 'Suite'; $lang->project->featureBar['testcase']['autocase'] = 'Automated'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 8cd1ce8b89..370f6d6741 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all'] = '所有'; $lang->project->featureBar['testcase']['wait'] = '待评审'; $lang->project->featureBar['testcase']['needconfirm'] = "需求变动"; $lang->project->featureBar['testcase']['group'] = '分组查看'; -$lang->project->featureBar['testcase']['zerocase'] = "零用例需求"; +$lang->project->featureBar['testcase']['zerocase'] = "零用例{$lang->SRCommon}"; $lang->project->featureBar['testcase']['suite'] = '套件'; $lang->project->featureBar['testcase']['autocase'] = '自动化'; diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 3be2de9479..999168bb67 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; $lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; -$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index d4d32c0c7e..81b547240b 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; $lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; -$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 0f3cb44993..3d027a8e0d 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; $lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; -$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 66feb53548..825452b53c 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group'] = '分组查看'; $lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->SRCommon}"; $lang->testcase->featureBar['browse']['suite'] = '套件'; $lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; -$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 91a8b52a71..49b5fea2d3 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -84,8 +84,8 @@ $rawMethod = $this->app->rawMethod; if(!isset($lang->{$rawModule}->featureBar[$rawMethod])) { - $rawModule = 'testcase'; - $rawMethod = 'browse'; + $rawModule = $app->tab == 'project' ? 'project' : 'testcase'; + $rawMethod = $rawModule == 'testcase' ? 'browse' : 'testcase'; } ?> @@ -184,13 +184,13 @@ $active = !empty($groupBy) ? 'btn-active-text' : ''; echo "
"; - echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID"), "{$lang->testcase->groupByStories}", '', "class='btn btn-link $active' data-app='{$this->app->tab}'"); + echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID"), "{$menuItem->text}", '', "class='btn btn-link $active' data-app='{$this->app->tab}'"); echo '
'; } elseif($hasZeroPriv and $menuType == 'zerocase') { $projectID = $isProjectApp ? $this->session->project : 0; - echo html::a($this->createLink('testcase', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "{$lang->testcase->zeroCase}", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'"); + echo html::a($this->createLink('testcase', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "{$menuItem->text}", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'"); } ?>