diff --git a/module/testtask/ui/batchrun.html.php b/module/testtask/ui/batchrun.html.php index 1a5fb906ab..59f21f6edf 100644 --- a/module/testtask/ui/batchrun.html.php +++ b/module/testtask/ui/batchrun.html.php @@ -58,7 +58,7 @@ foreach($cases as $caseID => $case) ( set::width('90px'), set::class("hidden steps"), - select + picker ( set::name("steps[$caseID][$stepID]"), set::items($lang->testcase->resultList), diff --git a/module/testtask/ui/close.html.php b/module/testtask/ui/close.html.php index 9b8c1e8c58..939865aa56 100644 --- a/module/testtask/ui/close.html.php +++ b/module/testtask/ui/close.html.php @@ -34,14 +34,14 @@ form set::label($lang->testtask->mailto), inputGroup ( - select + picker ( set::name('mailto'), set::items($users), set::value($testtask->mailto ? tr_replace(' ', '', $testtask->mailto) : ''), set::multiple(true), ), - $contactList ? select + $contactList ? picker ( set::name('contact'), set::items($contactList), diff --git a/module/testtask/ui/create.html.php b/module/testtask/ui/create.html.php index be9f9e575b..3e640f6d7d 100644 --- a/module/testtask/ui/create.html.php +++ b/module/testtask/ui/create.html.php @@ -26,7 +26,8 @@ formPanel set::class(!isset($executionID) || !empty($product->shadow) ? 'hidden' : ''), set::name('product'), set::value($product->id), - set::control(array('type' => 'select', 'items' => $products)), + set::control('picker'), + set::items($products) ), $noMultipleExecutionID ? input ( @@ -40,7 +41,8 @@ formPanel set::class(($app->tab == 'execution' && $executionID) ? 'hidden' : ''), set::name('execution'), set::value($executionID), - set::control(array('type' => 'select', 'items' => $executions)), + set::control('picker'), + set::items($executions), ), formGroup ( @@ -50,7 +52,7 @@ formPanel inputGroup ( set::seg(true), - select + picker ( set::name('build'), set::items($builds), @@ -85,14 +87,17 @@ formPanel set::width('1/2'), set::label($lang->testtask->type), set::name('type[]'), - set::control(array('type' => 'select', 'items' => $lang->testtask->typeList, 'multiple' => true)) + set::control('picker'), + set::items($lang->testtask->typeList), + set::multiple(true), ), formGroup ( set::width('1/2'), set::label($lang->testtask->owner), set::name('owner'), - set::control(array('type' => 'select', 'items' => $users)), + set::control('picker'), + set::items($users), ), formGroup ( @@ -123,14 +128,16 @@ formPanel set::label($lang->testtask->status), set::name('status'), set::required(true), - set::control(array('type' => 'select', 'items' => $lang->testtask->statusList)), + set::control('picker'), + set::items($lang->testtask->statusList), ), formGroup ( set::width('1/2'), set::label($lang->testtask->testreport), set::name('testreport'), - set::control(array('type' => 'select', 'items' => $testreports)) + set::control('picker'), + set::items($testreports), ), formGroup ( @@ -144,7 +151,7 @@ formPanel set::required(true), ), $lang->testtask->pri, - select + picker ( zui::width('80px'), set::name('pri'), @@ -170,8 +177,10 @@ formPanel formGroup ( set::label($lang->testtask->mailto), - set::control(array('type' => 'select', 'items' => $users, 'multiple' => true)), set::name('mailto[]'), + set::control('picker'), + set::items($users), + set::multiple(true), ), ); diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php index de7a7509c4..dc3687c61f 100644 --- a/module/testtask/ui/edit.html.php +++ b/module/testtask/ui/edit.html.php @@ -20,7 +20,8 @@ formPanel set::name('execution'), set::value($task->execution), set::class(((!empty($project) && !$project->multiple) || ($app->tab == 'execution' && $task->execution)) ? 'hidden' : ''), - set::control(array('type' => 'select', 'items' => $executions)) + set::control('picker'), + set::items($executions), ), formGroup ( @@ -29,7 +30,8 @@ formPanel set::required(true), set::name('build'), set::value($task->build), - set::control(array('type' => 'select', 'items' => $builds)) + set::control('picker'), + set::items($builds), ), formGroup ( @@ -37,7 +39,9 @@ formPanel set::label($lang->testtask->type), set::name('type[]'), set::value($task->type), - set::control(array('type' => 'select', 'items' => $lang->testtask->typeList, 'multiple' => true)) + set::control('picker'), + set::items($lang->testtask->typeList), + set::multiple(true), ), formGroup ( @@ -45,7 +49,8 @@ formPanel set::label($lang->testtask->owner), set::name('owner'), set::value($task->owner), - set::control(array('type' => 'select', 'items' => $users)) + set::control('picker'), + set::items($users), ), formGroup ( @@ -79,7 +84,8 @@ formPanel set::name('status'), set::required(true), set::value($task->status), - set::control(array('type' => 'select', 'items' => $lang->testtask->statusList)), + set::control('picker'), + set::items($lang->testtask->statusList), ), formGroup ( @@ -87,7 +93,8 @@ formPanel set::label($lang->testtask->testreport), set::name('testreport'), set::value($task->testreport), - set::control(array('type' => 'select', 'items' => $testreports)) + set::control('picker'), + set::items($testreports), ), formGroup ( @@ -102,7 +109,7 @@ formPanel set::value($task->name), ), $lang->testtask->pri, - select + picker ( zui::width('80px'), set::name('pri'), @@ -138,9 +145,11 @@ formPanel formGroup ( set::label($lang->testtask->mailto), - set::control(array('type' => 'select', 'items' => $users, 'multiple' => true)), set::name('mailto[]'), set::value(str_replace(' ', '', $task->mailto)), + set::control('picker'), + set::items($users), + set::multiple(true) ) ); diff --git a/module/testtask/ui/importunitresult.html.php b/module/testtask/ui/importunitresult.html.php index a4e46a8a77..3f695e9419 100644 --- a/module/testtask/ui/importunitresult.html.php +++ b/module/testtask/ui/importunitresult.html.php @@ -22,7 +22,7 @@ formPanel ( set::label($lang->testtask->execution), set::width('1/2'), - select + picker ( set::name('execution'), set::items($executions), @@ -35,7 +35,7 @@ formPanel set::required(true), inputGroup ( - select + picker ( set::name('build'), set::items($builds) @@ -57,7 +57,7 @@ formPanel ( set::label($lang->job->frame), set::width('1/2'), - select + picker ( set::name('frame'), set::items($lang->job->frameList), @@ -117,7 +117,7 @@ formPanel ( set::label($lang->testtask->owner), set::width('1/3'), - select + picker ( set::name('owner'), set::items($users), @@ -128,7 +128,7 @@ formPanel ( set::label($lang->testtask->pri), set::width('160px'), - select + picker ( zui::width('80px'), set::name('pri'), @@ -151,7 +151,7 @@ formPanel set::label($lang->testtask->mailto), inputGroup ( - select + picker ( set::name('mailto[]'), set::items($users), diff --git a/module/testtask/ui/runcase.html.php b/module/testtask/ui/runcase.html.php index 88814831b0..0ff654d288 100644 --- a/module/testtask/ui/runcase.html.php +++ b/module/testtask/ui/runcase.html.php @@ -58,7 +58,7 @@ if($confirm != 'yes') $itemTds[] = h::td ( setClass("text-center"), - select + picker ( on::change('checkStepValue'), set::name("steps[{$step->id}]"),