From bcb3548207c5452a3aea89db21c0b776aa40182a Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 27 Jul 2023 13:29:41 +0800 Subject: [PATCH] * Adjust group switch menu css. --- module/testtask/ui/cases.html.php | 59 ++++++++++++++++-------- module/testtask/ui/groupcase.html.php | 65 ++++++++++++++------------- 2 files changed, 74 insertions(+), 50 deletions(-) diff --git a/module/testtask/ui/cases.html.php b/module/testtask/ui/cases.html.php index af46e2dabd..8ac9030e69 100644 --- a/module/testtask/ui/cases.html.php +++ b/module/testtask/ui/cases.html.php @@ -58,16 +58,6 @@ else featureBar ( set::linkParams("taskID=$task->id&browseType={key}¶m=0"), - $canGroupCase ? li - ( - set::class('nav-item'), - a - ( - set::href(inlink('groupCase', "taskID=$task->id&groupBy=story")), - set('data-app', $app->tab), - $lang->testcase->groupByStories - ) - ) : null, dropdown ( btn @@ -80,19 +70,50 @@ featureBar li(searchToggle(set::open($browseType == 'bysearch'))) ); +$viewItems = array(); +$viewItems[] = array('text' => $lang->testcase->listView, 'url' => inlink('cases', "taskID={$task->id}"), 'active' => true); +$viewItems[] = array('text' => $lang->testcase->groupView, 'url' => inlink('groupCase', "taskID={$task->id}&groupBy=story"), 'active' => false); toolbar ( - set::items + dropdown ( - array + btn ( - $canLinkCase ? array('class' => 'ghost', 'icon' => 'link', 'text' => $lang->testtask->linkCase, 'url' => inlink('linkCase', "taskID=$task->id")) : null, - $canExport ? array('class' => 'ghost', 'icon' => 'export', 'text' => $lang->export, 'url' => $this->createLink('testcase', 'export', "productID=$productID&orderBy=case_desc&taskID=$task->id"), 'data-toggle' => 'modal') : null, - $canReport ? array('class' => 'ghost', 'icon' => 'bar-chart', 'text' => $lang->testtask->report->common, 'url' => inlink('report', "productID=$productID&taskID=$task->id&browseType=$browseType&branchID=$task->branch&moduleID=" . (empty($moduleID) ? '' : $moduleID))) : null, - $canView ? array('class' => 'ghost', 'icon' => 'list-alt', 'text' => $lang->testtask->view, 'url' => inlink('view', "taskID=$task->id")) : null, - array('class' => 'ghost', 'icon' => 'back', 'text' => $lang->goback, 'url' => $this->session->testtaskList) - ) - ) + setClass('btn ghost square'), + set::icon('kanban') + ), + set::items($viewItems), + set::placement('bottom-end'), + ), + $canLinkCase ? btn + ( + set::class('ghost'), + set::icon('link'), + set::url(inlink('linkCase', "taskID=$task->id")), + $lang->testtask->linkCase, + ) : null, + $canExport ? btn + ( + set::class('ghost'), + set::icon('export'), + set::url($this->createLink('testcase', 'export', "productID=$productID&orderBy=case_desc&taskID=$task->id")), + $lang->export + ) : null, + $canReport ? btn + ( + set::class('ghost'), + set::icon('bar-chart'), + set::url(inlink('report', "productID=$productID&taskID=$task->id&browseType=$browseType&branchID=$task->branch&moduleID=" . (empty($moduleID) ? '' : $moduleID))), + $lang->testtask->report->common + ) : null, + $canView ? btn + ( + set::class('ghost'), + set::icon('list-alt'), + set::url(inlink('view', "taskID=$task->id")), + $lang->testtask->view + ) : null, + btn(set::icon('back'), set::class('ghost'), set::url($this->session->testtaskList), $lang->goback) ); $footToolbar = null; diff --git a/module/testtask/ui/groupcase.html.php b/module/testtask/ui/groupcase.html.php index d6e8a2cbc9..b9bd6c0810 100644 --- a/module/testtask/ui/groupcase.html.php +++ b/module/testtask/ui/groupcase.html.php @@ -17,23 +17,6 @@ $canExport = hasPriv('testcase', 'export'); $canReport = hasPriv('testtask', 'report'); $canView = hasPriv('testtask', 'view'); -/* Process variables of sutie menu. */ -$suiteItems = array(); -if(empty($suites)) -{ - if($canCreateSuite && (empty($productID) || common::canModify('product', $product))) - { - $suiteItems[] = array('text' => $lang->testsuite->create, 'url' => $this->createLink('testsuite', 'create', "productID=$productID")); - } -} -else -{ - foreach($suites as $id => $name) - { - $suiteItems[] = array('text' => $name, 'url' => inlink('cases', "taskID=$task->id&browseType=bySuite¶m=$id"), 'active' => $name == $suiteName); - } -} - featureBar ( li @@ -41,7 +24,7 @@ featureBar set::class('nav-item'), a ( - set::href(inlink('cases', "taskID=$task->id&browseType=all")), + set::href(inlink('cases', "taskID={$task->id}&browseType=all")), set('data-app', $app->tab), $lang->testtask->allCases ) @@ -51,37 +34,57 @@ featureBar set::class('nav-item'), a ( - set::href(inlink('cases', "taskID=$task->id&browseType=assignedtome")), + set::href(inlink('cases', "taskID={$task->id}&browseType=assignedtome")), set('data-app', $app->tab), $lang->testtask->assignedToMe ) ) ); -$viewItems = array(array('text' => $lang->testcase->listView, 'url' => inlink('browse', "productID=$productID&branch=$branch&browseType=all"), 'active' => $rawMethod != 'groupcase' ? true : false)); +$viewItems = array(); +$viewItems[] = array('text' => $lang->testcase->listView, 'url' => inlink('cases', "taskID={$task->id}"), 'active' => false); +$viewItems[] = array('text' => $lang->testcase->groupView, 'url' => inlink('groupCase', "taskID={$task->id}&groupBy=story"), 'active' => true); toolbar ( dropdown ( btn ( - setClass('btn btn-link ghost square'), + setClass('btn ghost square'), set::icon('kanban') ), set::items($viewItems), set::placement('bottom-end'), ), - set::items + $canLinkCase ? btn ( - array - ( - $canLinkCase ? array('class' => 'ghost', 'icon' => 'link', 'text' => $lang->testtask->linkCase, 'url' => inlink('linkCase', "taskID=$task->id")) : null, - $canExport ? array('class' => 'ghost', 'icon' => 'export', 'text' => $lang->export, 'url' => $this->createLink('testcase', 'export', "productID=$productID&orderBy=case_desc&taskID=$task->id"), 'data-toggle' => 'modal') : null, - $canReport ? array('class' => 'ghost', 'icon' => 'bar-chart', 'text' => $lang->testtask->report->common, 'url' => inlink('report', "productID=$productID&taskID=$task->id&browseType=$browseType&branchID=$task->branch&moduleID=" . (empty($moduleID) ? '' : $moduleID))) : null, - $canView ? array('class' => 'ghost', 'icon' => 'list-alt', 'text' => $lang->testtask->view, 'url' => inlink('view', "taskID=$task->id")) : null, - array('class' => 'ghost', 'icon' => 'back', 'text' => $lang->goback, 'url' => $this->session->testtaskList) - ) - ) + set::class('ghost'), + set::icon('link'), + set::url(inlink('linkCase', "taskID=$task->id")), + $lang->testtask->linkCase, + ) : null, + $canExport ? btn + ( + set::class('ghost'), + set::icon('export'), + set::url($this->createLink('testcase', 'export', "productID=$productID&orderBy=case_desc&taskID=$task->id")), + $lang->export + ) : null, + $canReport ? btn + ( + set::class('ghost'), + set::icon('bar-chart'), + set::url(inlink('report', "productID=$productID&taskID=$task->id&browseType=$browseType&branchID=$task->branch&moduleID=" . (empty($moduleID) ? '' : $moduleID))), + $lang->testtask->report->common + ) : null, + $canView ? btn + ( + set::class('ghost'), + set::icon('list-alt'), + set::url(inlink('view', "taskID=$task->id")), + $lang->testtask->view + ) : null, + btn(set::icon('back'), set::class('ghost'), set::url($this->session->testtaskList), $lang->goback) ); $config->testcase->actionList['runCase']['url'] = array('module' => 'testtask', 'method' => 'runCase', 'params' => 'runID={id}&caseID={case}&version={version}');