Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* testcaseBrowse: rename $typeItems to $dropdownItems and sort code.

Browse Source
This commit is contained in:
liugang
2023-06-06 10:15:08 +08:00
parent cc21297e25
commit 98ffacb5bb
1 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/ui/browse.html.php
+72 -71
View File
@@ -10,6 +10,78 @@ declare(strict_types=1);
*/
namespace zin;
$lang->testcase->typeList[''] = $lang->testcase->allType;
if(!isset($param)) $param = 0;
$hasUnitPriv = common::hasPriv('testtask', 'browseunits');
$dropdownItems = array();
foreach($lang->testcase->typeList as $type => $typeName)
{
if($hasUnitPriv and $type == 'unit')
{
$url = $this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID");
$text = $lang->testcase->browseUnits;
}
elseif(isset($groupBy))
{
$url = $this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID&caseType=$type");
$text = $typeName;
}
else
{
$url = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$type");
$text = $typeName;
}
$dropdownItems[] = array('text' => $text, 'url' => $url, 'active' => $type == $caseType);
}
$currentTypeName = zget($lang->testcase->typeList, $caseType, '');
$currentLabel = empty($currentTypeName) ? $lang->testcase->allType : $currentTypeName;
featureBar
(
to::before
(
dropdown
(
btn
(
setClass('dropdown-toggle'),
$currentLabel
),
set::items($dropdownItems)
)
)
);
toolbar
(
btngroup
(
btn
(
setClass('btn primary'),
set::icon('plus'),
set::url(helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule")),
$lang->testcase->create
),
dropdown
(
btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
set::items
(
array
(
array('text' => $lang->testcase->create, 'url' => helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule")),
array('text' => $lang->testcase->batchCreate, 'url' => helper::createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule")),
array('text' => $lang->testcase->newScene, 'url' => helper::createLink('testcase', 'createScene', "productID=$productID&branch=$branch&moduleID=$initModule"))
)
),
set::placement('bottom-end'),
)
)
);
$closeLink = $browseType == 'bymodule' ? createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&caseType=&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
sidebar
(
@@ -38,77 +110,6 @@ foreach($cases as $case)
$cols = array_values($config->testcase->dtable->fieldList);
$data = array_values($cases);
$lang->testcase->typeList[''] = $lang->testcase->allType;
if(!isset($param)) $param = 0;
$hasUnitPriv = common::hasPriv('testtask', 'browseunits');
$typeItems = array();
foreach($lang->testcase->typeList as $type => $typeName)
{
if($hasUnitPriv and $type == 'unit')
{
$url = $this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID");
$text = $lang->testcase->browseUnits;
}
elseif(isset($groupBy))
{
$url = $this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID&caseType=$type");
$text = $typeName;
}
else
{
$url = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$type");
$text = $typeName;
}
$typeItems[] = array('text' => $text, 'url' => $url, 'active' => $type == $caseType);
}
$currentTypeName = zget($lang->testcase->typeList, $caseType, '');
$currentLabel = empty($currentTypeName) ? $lang->testcase->allType : $currentTypeName;
featureBar
(
to::before
(
dropdown
(
btn
(
setClass('dropdown-toggle'),
$currentLabel
),
set::items($typeItems)
)
)
);
toolbar
(
btngroup
(
btn
(
setClass('btn primary'),
set::icon('plus'),
set::url(helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule")),
$lang->testcase->create
),
dropdown
(
btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
set::items
(
array
(
array('text' => $lang->testcase->create, 'url' => helper::createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule")),
array('text' => $lang->testcase->batchCreate, 'url' => helper::createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule")),
array('text' => $lang->testcase->newScene, 'url' => helper::createLink('testcase', 'createScene', "productID=$productID&branch=$branch&moduleID=$initModule"))
)
),
set::placement('bottom-end'),
)
)
);
$footToolbar = array('items' => array
(
array('type' => 'btn-group', 'items' => array