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

* Use picker instead of select.

Browse Source
This commit is contained in:
daitingting
2023-07-12 05:43:29 +00:00
parent d062ff425b
commit 69fabe4c5a
9 changed files with 88 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/ui/activate.html.php
+2 -2
View File
@@ -18,7 +18,7 @@ formPanel
(
set::width('1/3'),
set::label($lang->bug->assignedTo),
select
picker
(
set::name('assignedTo'),
set::value($bug->resolvedBy),
@@ -29,7 +29,7 @@ formPanel
(
set::width('1/2'),
set::label($lang->bug->openedBuild),
select
picker
(
set::name('openedBuild[]'),
set::value($bug->openedBuild),
module/bug/ui/assignto.html.php
+3 -1
View File
@@ -32,9 +32,11 @@ formPanel
formGroup
(
set::label($lang->bug->mailto),
set::control(array('type' => 'select', 'items' => $users, 'multiple' => true)),
set::control('picker'),
set::name('mailto[]'),
set::value(str_replace(' ', '', $bug->mailto ?: '')),
set::items($users),
set::multiple(true),
),
formGroup
(
module/bug/ui/batchactivate.html.php
+2 -2
View File
@@ -16,8 +16,8 @@ $items[] = array('name' => 'status', 'label' => '');
$items[] = array('name' => 'id', 'label' => '');
$items[] = array('name' => 'id', 'label' => $lang->idAB, 'control' => 'index', 'width' => '40px');
$items[] = array('name' => 'title', 'label' => $lang->bug->title, 'control' => 'static', 'width' => '120px');
$items[] = array('name' => 'assignedTo', 'label' => $lang->bug->assignedTo, 'control' => 'select', 'width' => '160px', 'items' => $users);
$items[] = array('name' => 'openedBuild', 'label' => $lang->bug->openedBuild, 'control' => 'select', 'multiple' => true, 'width' => '200px', 'items' => $builds);
$items[] = array('name' => 'assignedTo', 'label' => $lang->bug->assignedTo, 'control' => 'picker', 'width' => '160px', 'items' => $users);
$items[] = array('name' => 'openedBuild', 'label' => $lang->bug->openedBuild, 'control' => 'picker', 'multiple' => true, 'width' => '200px', 'items' => $builds);
$items[] = array('name' => 'comment', 'label' => $lang->bug->legendComment, 'control' => 'editor', 'width' => '1/3');
foreach($bugs as $bug)
module/bug/ui/batchcreate.html.php
+26 -28
View File
@@ -43,7 +43,7 @@ $items[] = array
'name' => 'branch',
'label' => $lang->product->branchName[$product->type],
'hidden' => zget($visibleFields, $product->type, true, false),
'control' => 'select',
'control' => 'picker',
'items' => $branches,
'value' => $branch,
'width' => '200px',
@@ -55,7 +55,7 @@ $items[] = array
(
'name' => 'module',
'label' => $lang->bug->module,
'control' => 'select',
'control' => 'picker',
'items' => $moduleOptionMenu,
'value' => $moduleID,
'width' => '200px',
@@ -69,7 +69,7 @@ $items[] = array
'name' => 'project',
'label' => $lang->bug->project,
'hidden' => zget($visibleFields, 'project', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $projects,
'value' => $projectID,
'width' => '200px',
@@ -83,7 +83,7 @@ $items[] = array
'name' => 'execution',
'label' => isset($project->model) && $project->model == 'kanban' ? $lang->bug->kanban : $lang->bug->execution,
'hidden' => zget($visibleFields, 'execution', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $executions,
'value' => $executionID,
'width' => '200px',
@@ -96,12 +96,10 @@ $items[] = array
(
'name' => 'openedBuild',
'label' => $lang->bug->openedBuild,
'control' => array(
'type' => 'select',
'items' => $builds,
'value' => 'trunk',
'multiple' => true,
),
'control' => 'picker',
'items' => $builds,
'value' => 'trunk',
'multiple' => true,
'width' => '200px',
'required' => true,
'ditto' => true,
@@ -121,23 +119,23 @@ if(isset($executionType) && $executionType == 'kanban')
{
$items[] = array
(
'name' => 'region',
'label' => $lang->kanbancard->region,
'control' => 'select',
'value' => $regionID,
'items' => $regionPairs,
'width' => '200px',
'name' => 'region',
'label' => $lang->kanbancard->region,
'control' => 'picker',
'value' => $regionID,
'items' => $regionPairs,
'width' => '200px',
'required' => true,
);
$items[] = array
(
'name' => 'laneID',
'label' => $lang->kanbancard->lane,
'control' => 'select',
'value' => $laneID,
'items' => $lanePairs,
'width' => '200px',
'name' => 'laneID',
'label' => $lang->kanbancard->lane,
'control' => 'picker',
'value' => $laneID,
'items' => $lanePairs,
'width' => '200px',
'required' => true,
);
}
@@ -170,7 +168,7 @@ $items[] = array
'name' => 'type',
'label' => $lang->typeAB,
'hidden' => zget($visibleFields, 'type', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $lang->bug->typeList,
'value' => '',
'width' => '160px',
@@ -184,12 +182,12 @@ $items[] = array
'name' => 'pri',
'label' => $lang->bug->pri,
'hidden' => zget($visibleFields, 'pri', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $lang->bug->priList,
'value' => '',
'width' => '80px',
'required' => isset($requiredFields['pri']),
'ditto' => true,
'ditto' => true,
);
/* Field of severity. */
@@ -198,7 +196,7 @@ $items[] = array
'name' => 'severity',
'label' => $lang->bug->severity,
'hidden' => zget($visibleFields, 'severity', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $lang->bug->severityList,
'value' => 3,
'width' => '80px',
@@ -211,7 +209,7 @@ $items[] = array
'name' => 'os',
'label' => $lang->bug->os,
'hidden' => zget($visibleFields, 'os', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $lang->bug->osList,
'width' => '200px',
'required' => isset($requiredFields['os']),
@@ -223,7 +221,7 @@ $items[] = array
'name' => 'browser',
'label' => $lang->bug->browser,
'hidden' => zget($visibleFields, 'browser', true, false),
'control' => 'select',
'control' => 'picker',
'items' => $lang->bug->browserList,
'width' => '200px',
'required' => isset($requiredFields['browser']),
module/bug/ui/batchedit.html.php
+15 -11
View File
@@ -63,7 +63,7 @@ formBatchPanel
set::name('type'),
set::label($lang->typeAB),
set::hidden(zget($visibleFields, 'type', true, false)),
set::control('select'),
set::control('picker'),
set::items($lang->bug->typeList),
set::width('160px'),
set::required(isset($requiredFields['type'])),
@@ -76,7 +76,7 @@ formBatchPanel
set::name('severity'),
set::label($lang->bug->severity),
set::hidden(zget($visibleFields, 'severity', true, false)),
set::control('select'),
set::control('picker'),
set::items($lang->bug->severityList),
set::width('80px'),
set::required(isset($requiredFields['severity'])),
@@ -87,7 +87,7 @@ formBatchPanel
set::name('pri'),
set::label($lang->bug->pri),
set::hidden(zget($visibleFields, 'pri', true, false)),
set::control('select'),
set::control('picker'),
set::items($lang->bug->priList),
set::width('80px'),
set::required(isset($requiredFields['pri'])),
@@ -105,7 +105,7 @@ formBatchPanel
(
set::name('branch'),
set::label($lang->bug->branch),
set::control('select'),
set::control('picker'),
set::items(array()),
set::width('200px'),
set::required(isset($requiredFields['branch'])),
@@ -116,7 +116,7 @@ formBatchPanel
(
set::name('module'),
set::label($lang->bug->module),
set::control('select'),
set::control('picker'),
set::items(array()),
set::width('200px'),
set::required(isset($requiredFields['module'])),
@@ -128,7 +128,7 @@ formBatchPanel
(
set::name('assignedTo'),
set::label($lang->bug->assignedTo),
set::control('select'),
set::control('picker'),
set::items($users),
set::width('200px'),
set::required(isset($requiredFields['assignedTo'])),
@@ -151,7 +151,9 @@ formBatchPanel
set::name('os'),
set::label($lang->bug->os),
set::hidden(zget($visibleFields, 'os', true, false)),
set::control(array('type' => 'select', 'items' => $lang->bug->osList, 'multiple' => true)),
set::control('picker'),
set::items($lang->bug->osList),
set::multiple(true),
set::width('200px'),
set::required(isset($requiredFields['os'])),
),
@@ -161,7 +163,9 @@ formBatchPanel
set::name('browser'),
set::label($lang->bug->browser),
set::hidden(zget($visibleFields, 'browser', true, false)),
set::control(array('type' => 'select', 'items' => $lang->bug->browserList, 'multiple' => true)),
set::control('picker'),
set::items($lang->bug->browserList),
set::multiple(true),
set::width('200px'),
set::required(isset($requiredFields['browser'])),
),
@@ -179,7 +183,7 @@ formBatchPanel
(
set::name('resolvedBy'),
set::label($lang->bug->resolvedBy),
set::control('select'),
set::control('picker'),
set::items($users),
set::width('200px'),
set::required(isset($requiredFields['resolvedBy'])),
@@ -195,13 +199,13 @@ formBatchPanel
set::control('inputGroup'),
inputGroup
(
select
picker
(
set::name('resolution'),
set::items($resolutionList),
set::required(isset($requiredFields['resolution'])),
),
select
picker
(
setClass('hidden'),
set::name('duplicate'),
module/bug/ui/confirm.html.php
+8 -4
View File
@@ -20,7 +20,7 @@ formPanel
(
set::width('1/3'),
set::label($lang->bug->assignedTo),
select
picker
(
set::name('assignedTo'),
set::items($users),
@@ -32,7 +32,8 @@ formPanel
set::width('1/3'),
set::name('type'),
set::label($lang->bug->type),
set::control(array('type' => 'select', 'items' => $lang->bug->typeList)),
set::control('picker'),
set::items($lang->bug->typeList),
set::value($bug->type)
),
formGroup
@@ -40,7 +41,8 @@ formPanel
set::width('1/3'),
set::name('pri'),
set::label($lang->bug->pri),
set::control(array('type' => 'select', 'items' => $lang->bug->priList)),
set::control('picker')
set::items($lang->bug->priList)
set::value($bug->pri)
),
formRow
@@ -57,7 +59,9 @@ formPanel
formGroup
(
set::label($lang->bug->lblMailto),
set::control(array('type' => 'select', 'items' => $users, 'multiple' => true)),
set::control('picker'),
set::items($users),
set::multiple(true),
set::name('mailto[]'),
set::value(str_replace(' ', '', $bug->mailto ?: '')),
),
module/bug/ui/edit.html.php
+28 -28
View File
@@ -95,13 +95,13 @@ detailBody
set::name($lang->bug->product),
inputGroup
(
select
picker
(
set::name('product'),
set::items($products),
set::value($product->id)
),
$product->type != 'normal' ? select
$product->type != 'normal' ? picker
(
set::width('100px'),
set::name('branch'),
@@ -116,7 +116,7 @@ detailBody
inputGroup
(
set('id', 'moduleBox'),
select
picker
(
set::name('module'),
set::items($moduleOptionMenu),
@@ -149,7 +149,7 @@ detailBody
inputGroup
(
set('id', 'planBox'),
select
picker
(
set::name('plan'),
set::items($plans),
@@ -163,7 +163,7 @@ detailBody
inputGroup
(
set('id', 'caseBox'),
select
picker
(
set::name('case'),
set::items($cases),
@@ -174,7 +174,7 @@ detailBody
item
(
set::name($lang->bug->type),
select
picker
(
set::items($lang->bug->typeList),
set::name('type'),
@@ -184,7 +184,7 @@ detailBody
item
(
set::name($lang->bug->severity),
select
picker
(
set::items($lang->bug->severityList),
set::name('severity'),
@@ -194,7 +194,7 @@ detailBody
item
(
set::name($lang->bug->pri),
select
picker
(
set::items($lang->bug->priList),
set::name('pri'),
@@ -204,7 +204,7 @@ detailBody
item
(
set::name($lang->bug->status),
select
picker
(
set::disabled(true),
set::items($lang->bug->statusList),
@@ -214,7 +214,7 @@ detailBody
item
(
set::name($lang->bug->confirmed),
select
picker
(
set::disabled(true),
set::items($lang->bug->confirmedList),
@@ -226,7 +226,7 @@ detailBody
set::name($lang->bug->assignedTo),
inputGroup
(
select
picker
(
set::disabled($bug->status == 'closed' ? true : false),
set::name('assignedTo'),
@@ -275,7 +275,7 @@ detailBody
item
(
set::name($lang->bug->os),
select
picker
(
set::items($lang->bug->osList),
set::multiple(true),
@@ -286,7 +286,7 @@ detailBody
item
(
set::name($lang->bug->browser),
select
picker
(
set::items($lang->bug->browserList),
set::name('browser'),
@@ -307,7 +307,7 @@ detailBody
set::name($lang->bug->mailto),
inputGroup
(
select
picker
(
set::items($users),
set::multiple(true),
@@ -318,7 +318,7 @@ detailBody
(
set('id', 'contactBox'),
set('class', 'input-group-addon'),
$contactList ? select
$contactList ? picker
(
set::class('width', 'w-20'),
set::name('contactListMenu'),
@@ -356,7 +356,7 @@ detailBody
inputGroup
(
set('id', 'projectBox'),
select
picker
(
set::name('project'),
set::items($projects),
@@ -371,7 +371,7 @@ detailBody
inputGroup
(
set('id', 'executionBox'),
select
picker
(
set::name('execution'),
set::items($executions),
@@ -385,7 +385,7 @@ detailBody
inputGroup
(
set('id', 'storyBox'),
select
picker
(
set::name('story'),
set::items($stories),
@@ -399,7 +399,7 @@ detailBody
inputGroup
(
set('id', 'taskBox'),
select
picker
(
set::name('task'),
set::items($tasks),
@@ -415,7 +415,7 @@ detailBody
item
(
set::name($lang->bug->openedBy),
select
picker
(
set::disabled(true),
set::items($users),
@@ -428,7 +428,7 @@ detailBody
inputGroup
(
set('id', 'openedBuildBox'),
select
picker
(
set::name('openedBuild[]'),
set::items($openedBuilds),
@@ -450,7 +450,7 @@ detailBody
item
(
set::name($lang->bug->resolvedBy),
select
picker
(
set::items($users),
set::name('resolvedBy'),
@@ -472,7 +472,7 @@ detailBody
inputGroup
(
set('id', 'resolvedBuildBox'),
select
picker
(
set::name('resolvedBuild'),
set::items($resolvedBuilds),
@@ -493,7 +493,7 @@ detailBody
item
(
set::name($lang->bug->resolution),
select
picker
(
set::items($lang->bug->resolutionList),
set::name('resolution'),
@@ -505,7 +505,7 @@ detailBody
set::id('duplicateBugBox'),
$bug->resolution != 'duplicate' ? setStyle(array('display' => 'none')) : null,
set::name($lang->bug->duplicateBug),
select
picker
(
set::items($productBugs),
set::name('duplicateBug'),
@@ -515,7 +515,7 @@ detailBody
item
(
set::name($lang->bug->closedBy),
select
picker
(
set::items($users),
set::name('closedBy'),
@@ -542,7 +542,7 @@ detailBody
inputGroup
(
set('id', 'linkBugsBox'),
select
picker
(
set::multiple(true),
set::name('relatedBug[]'),
@@ -566,7 +566,7 @@ detailBody
inputGroup
(
set('id', 'testtaskBox'),
select
picker
(
set::name('testtask'),
set::items($testtasks),
module/bug/ui/resolve.html.php
+2 -2
View File
@@ -69,7 +69,7 @@ formPanel
set::id('newBuildExecutionBox'),
setClass('hidden'),
set::label(!empty($execution) && $execution->type == 'kanban' ? $lang->bug->kanban : $lang->build->execution),
select
picker
(
set::name('buildExecution'),
set::items($executions),
@@ -83,7 +83,7 @@ formPanel
set::label($lang->bug->resolvedBuild),
inputGroup
(
select
picker
(
set::name('resolvedBuild'),
set::value(''),
module/bug/ui/view.html.php
+2 -2
View File
@@ -308,7 +308,7 @@ modal
(
set::label($lang->bug->selectProjects),
set::required(true),
set::control('select'),
set::control('picker'),
set::name('taskProjects'),
set::items($projects),
)
@@ -322,7 +322,7 @@ modal
inputGroup
(
set('id', 'executionBox'),
select
picker
(
set::name('execution'),
set::items(),