From b7024afe32174fcec8ae3a6b489361b66a0e6f0e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 11 Jul 2023 10:09:37 +0800 Subject: [PATCH] * Change select to picker in block module. --- module/block/config.php | 62 ++++++++++++++--------------- module/block/ui/create.html.php | 6 +-- module/block/ui/edit.html.php | 6 +-- module/block/ui/preference.html.php | 10 ++--- module/block/ui/systemmode.html.php | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/module/block/config.php b/module/block/config.php index b6328c8859..d5c0ce6486 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -50,47 +50,47 @@ $config->block->params['default']->count['control'] = 'input'; $config->block->params['task'] = new stdclass(); $config->block->params['task']->type['name'] = $lang->block->type; $config->block->params['task']->type['options'] = $lang->block->typeList->task; -$config->block->params['task']->type['control'] = 'select'; +$config->block->params['task']->type['control'] = 'picker'; $config->block->params['task']->orderBy['name'] = $lang->block->orderBy; $config->block->params['task']->orderBy['default'] = 'id_desc'; $config->block->params['task']->orderBy['options'] = $lang->block->orderByList->task; -$config->block->params['task']->orderBy['control'] = 'select'; +$config->block->params['task']->orderBy['control'] = 'picker'; $config->block->params['task']->count = $config->block->params['default']->count; $config->block->params['bug'] = new stdclass(); $config->block->params['bug']->type['name'] = $lang->block->type; $config->block->params['bug']->type['options'] = $lang->block->typeList->bug; -$config->block->params['bug']->type['control'] = 'select'; +$config->block->params['bug']->type['control'] = 'picker'; $config->block->params['bug']->orderBy['name'] = $lang->block->orderBy; $config->block->params['bug']->orderBy['default'] = 'id_desc'; $config->block->params['bug']->orderBy['options'] = $lang->block->orderByList->bug; -$config->block->params['bug']->orderBy['control'] = 'select'; +$config->block->params['bug']->orderBy['control'] = 'picker'; $config->block->params['bug']->count = $config->block->params['default']->count; $config->block->params['case'] = new stdclass(); $config->block->params['case']->type['name'] = $lang->block->type; $config->block->params['case']->type['options'] = $lang->block->typeList->case; -$config->block->params['case']->type['control'] = 'select'; +$config->block->params['case']->type['control'] = 'picker'; $config->block->params['case']->orderBy['name'] = $lang->block->orderBy; $config->block->params['case']->orderBy['default'] = 'id_desc'; $config->block->params['case']->orderBy['options'] = $lang->block->orderByList->case; -$config->block->params['case']->orderBy['control'] = 'select'; +$config->block->params['case']->orderBy['control'] = 'picker'; $config->block->params['case']->count = $config->block->params['default']->count; $config->block->params['testtask'] = new stdclass(); $config->block->params['testtask']->type['name'] = $lang->block->type; $config->block->params['testtask']->type['options'] = $lang->block->typeList->testtask; -$config->block->params['testtask']->type['control'] = 'select'; +$config->block->params['testtask']->type['control'] = 'picker'; $config->block->params['testtask']->count = $config->block->params['default']->count; $config->block->params['story'] = new stdclass(); $config->block->params['story']->type['name'] = $lang->block->type; $config->block->params['story']->type['options'] = $lang->block->typeList->story; -$config->block->params['story']->type['control'] = 'select'; +$config->block->params['story']->type['control'] = 'picker'; $config->block->params['story']->orderBy['name'] = $lang->block->orderBy; $config->block->params['story']->orderBy['default'] = 'id_desc'; $config->block->params['story']->orderBy['options'] = $lang->block->orderByList->story; -$config->block->params['story']->orderBy['control'] = 'select'; +$config->block->params['story']->orderBy['control'] = 'picker'; $config->block->params['story']->count = $config->block->params['default']->count; $config->block->params['plan'] = $config->block->params['default']; @@ -100,19 +100,19 @@ $config->block->params['release'] = $config->block->params['default']; $config->block->params['project'] = new stdclass(); $config->block->params['project']->type['name'] = $lang->block->type; $config->block->params['project']->type['options'] = $lang->block->typeList->projectAll; -$config->block->params['project']->type['control'] = 'select'; +$config->block->params['project']->type['control'] = 'picker'; $config->block->params['project']->orderBy['name'] = $lang->block->orderBy; $config->block->params['project']->orderBy['options'] = $lang->block->orderByList->product; -$config->block->params['project']->orderBy['control'] = 'select'; +$config->block->params['project']->orderBy['control'] = 'picker'; $config->block->params['project']->count = $config->block->params['default']->count; $config->block->params['projectteam'] = new stdclass(); $config->block->params['projectteam']->type['name'] = $lang->block->type; $config->block->params['projectteam']->type['options'] = $lang->block->typeList->projectAll; -$config->block->params['projectteam']->type['control'] = 'select'; +$config->block->params['projectteam']->type['control'] = 'picker'; $config->block->params['projectteam']->orderBy['name'] = $lang->block->orderBy; $config->block->params['projectteam']->orderBy['options'] = $lang->block->orderByList->project; -$config->block->params['projectteam']->orderBy['control'] = 'select'; +$config->block->params['projectteam']->orderBy['control'] = 'picker'; $config->block->params['projectteam']->count = $config->block->params['default']->count; $config->block->params['build'] = $config->block->params['default']; @@ -120,85 +120,85 @@ $config->block->params['build'] = $config->block->params['default']; $config->block->params['product'] = new stdclass(); $config->block->params['product']->type['name'] = $lang->block->type; $config->block->params['product']->type['options'] = $lang->block->typeList->product; -$config->block->params['product']->type['control'] = 'select'; +$config->block->params['product']->type['control'] = 'picker'; $config->block->params['product']->count = $config->block->params['default']->count; $config->block->params['productstatistic'] = new stdclass(); $config->block->params['productstatistic']->type['name'] = $lang->block->type; $config->block->params['productstatistic']->type['options'] = $lang->block->typeList->product; -$config->block->params['productstatistic']->type['control'] = 'select'; +$config->block->params['productstatistic']->type['control'] = 'picker'; $config->block->params['productstatistic']->count = $config->block->params['default']->count; $config->block->params['projectstatistic'] = new stdclass(); $config->block->params['projectstatistic']->type['name'] = $lang->block->type; $config->block->params['projectstatistic']->type['options'] = $lang->block->typeList->project; -$config->block->params['projectstatistic']->type['control'] = 'select'; +$config->block->params['projectstatistic']->type['control'] = 'picker'; $config->block->params['projectstatistic']->count = $config->block->params['default']->count; $config->block->params['bugstatistic'] = new stdclass(); $config->block->params['bugstatistic']->type['name'] = $lang->block->type; $config->block->params['bugstatistic']->type['options'] = $lang->block->typeList->project; -$config->block->params['bugstatistic']->type['control'] = 'select'; +$config->block->params['bugstatistic']->type['control'] = 'picker'; $config->block->params['bugstatistic']->count = $config->block->params['default']->count; $config->block->params['releasestatistic'] = new stdclass(); $config->block->params['releasestatistic']->type['name'] = $lang->block->type; $config->block->params['releasestatistic']->type['options'] = $lang->block->typeList->project; -$config->block->params['releasestatistic']->type['control'] = 'select'; +$config->block->params['releasestatistic']->type['control'] = 'picker'; $config->block->params['releasestatistic']->count = $config->block->params['default']->count; $config->block->params['executionstatistic'] = new stdclass(); $config->block->params['executionstatistic']->type['name'] = $lang->block->type; $config->block->params['executionstatistic']->type['options'] = $lang->block->typeList->execution; -$config->block->params['executionstatistic']->type['control'] = 'select'; +$config->block->params['executionstatistic']->type['control'] = 'picker'; $config->block->params['executionstatistic']->count = $config->block->params['default']->count; $config->block->params['qastatistic'] = new stdclass(); $config->block->params['qastatistic']->type['name'] = $lang->block->type; $config->block->params['qastatistic']->type['options'] = $lang->block->typeList->product; -$config->block->params['qastatistic']->type['control'] = 'select'; +$config->block->params['qastatistic']->type['control'] = 'picker'; $config->block->params['qastatistic']->count = $config->block->params['default']->count; $config->block->params['waterfallissue'] = new stdclass(); $config->block->params['waterfallissue']->type['name'] = $lang->block->type; $config->block->params['waterfallissue']->type['options'] = $lang->block->typeList->issue; -$config->block->params['waterfallissue']->type['control'] = 'select'; +$config->block->params['waterfallissue']->type['control'] = 'picker'; $config->block->params['waterfallissue']->orderBy['name'] = $lang->block->orderBy; $config->block->params['waterfallissue']->orderBy['options'] = $lang->block->orderByList->product; -$config->block->params['waterfallissue']->orderBy['control'] = 'select'; +$config->block->params['waterfallissue']->orderBy['control'] = 'picker'; $config->block->params['waterfallissue']->count = $config->block->params['default']->count; $config->block->params['waterfallrisk'] = new stdclass(); $config->block->params['waterfallrisk']->type['name'] = $lang->block->type; $config->block->params['waterfallrisk']->type['options'] = $lang->block->typeList->risk; -$config->block->params['waterfallrisk']->type['control'] = 'select'; +$config->block->params['waterfallrisk']->type['control'] = 'picker'; $config->block->params['waterfallrisk']->orderBy['name'] = $lang->block->orderBy; $config->block->params['waterfallrisk']->orderBy['options'] = $lang->block->orderByList->product; -$config->block->params['waterfallrisk']->orderBy['control'] = 'select'; +$config->block->params['waterfallrisk']->orderBy['control'] = 'picker'; $config->block->params['waterfallrisk']->count = $config->block->params['default']->count; $config->block->params['scrumissue'] = new stdclass(); $config->block->params['scrumissue']->type['name'] = $lang->block->type; $config->block->params['scrumissue']->type['options'] = $lang->block->typeList->issue; -$config->block->params['scrumissue']->type['control'] = 'select'; +$config->block->params['scrumissue']->type['control'] = 'picker'; $config->block->params['scrumissue']->orderBy['name'] = $lang->block->orderBy; $config->block->params['scrumissue']->orderBy['options'] = $lang->block->orderByList->product; -$config->block->params['scrumissue']->orderBy['control'] = 'select'; +$config->block->params['scrumissue']->orderBy['control'] = 'picker'; $config->block->params['scrumissue']->count = $config->block->params['default']->count; $config->block->params['scrumrisk'] = new stdclass(); $config->block->params['scrumrisk']->type['name'] = $lang->block->type; $config->block->params['scrumrisk']->type['options'] = $lang->block->typeList->risk; -$config->block->params['scrumrisk']->type['control'] = 'select'; +$config->block->params['scrumrisk']->type['control'] = 'picker'; $config->block->params['scrumrisk']->orderBy['name'] = $lang->block->orderBy; $config->block->params['scrumrisk']->orderBy['options'] = $lang->block->orderByList->product; -$config->block->params['scrumrisk']->orderBy['control'] = 'select'; +$config->block->params['scrumrisk']->orderBy['control'] = 'picker'; $config->block->params['scrumrisk']->count = $config->block->params['default']->count; $config->block->params['execution'] = new stdclass(); $config->block->params['execution']->type['name'] = $lang->block->type; $config->block->params['execution']->type['options'] = $lang->block->typeList->execution; -$config->block->params['execution']->type['control'] = 'select'; +$config->block->params['execution']->type['control'] = 'picker'; $config->block->params['execution']->count = $config->block->params['default']->count; $config->block->params['assigntome'] = new stdclass(); @@ -250,13 +250,13 @@ $config->block->params['assigntome']->count = $config->block->params['default']- $config->block->params['scrumtest'] = new stdclass(); $config->block->params['scrumtest']->type['name'] = $lang->block->type; $config->block->params['scrumtest']->type['options'] = $lang->block->typeList->testtask; -$config->block->params['scrumtest']->type['control'] = 'select'; +$config->block->params['scrumtest']->type['control'] = 'picker'; $config->block->params['scrumtest']->count = $config->block->params['default']->count; $config->block->params['scrumlist'] = new stdclass(); $config->block->params['scrumlist']->type['name'] = $lang->block->type; $config->block->params['scrumlist']->type['options'] = $lang->block->typeList->scrum; -$config->block->params['scrumlist']->type['control'] = 'select'; +$config->block->params['scrumlist']->type['control'] = 'picker'; $config->block->params['scrumlist']->count = $config->block->params['default']->count; $config->block->params['scrumProduct'] = $config->block->params['default']->count; diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php index 163f6b577e..537fd90b24 100644 --- a/module/block/ui/create.html.php +++ b/module/block/ui/create.html.php @@ -41,7 +41,7 @@ foreach($params as $key => $row) 'type' => $row['control'], 'items' => isset($row['options']) ? $row['options'] : null, )), - $row['control'] == 'select' ? set::required(true) : '', + $row['control'] == 'picker' ? set::required(true) : '', ), ); } @@ -118,7 +118,7 @@ div ( $showCodes ? array ( - 'type' => 'select', + 'type' => 'picker', 'items' => array('') + $codes ) : 'input' ) @@ -144,7 +144,7 @@ div formGroup ( set::label($lang->block->width), - select + picker ( set::name('width'), set::items($widthOptions), diff --git a/module/block/ui/edit.html.php b/module/block/ui/edit.html.php index 1835fabce2..ef6884096f 100644 --- a/module/block/ui/edit.html.php +++ b/module/block/ui/edit.html.php @@ -34,7 +34,7 @@ foreach($params as $key => $row) 'type' => $row['control'], 'items' => isset($row['options']) ? $row['options'] : null, )), - $row['control'] == 'select' ? set::required(true) : '', + $row['control'] == 'picker' ? set::required(true) : '', ), ); } @@ -111,7 +111,7 @@ div ( $showCodes ? array ( - 'type' => 'select', + 'type' => 'picker', 'items' => array('') + $codes ) : 'input' ) @@ -137,7 +137,7 @@ div formGroup ( set::label($lang->block->width), - select + picker ( set::name('width'), set::items($widthOptions), diff --git a/module/block/ui/preference.html.php b/module/block/ui/preference.html.php index 8e92e5b354..678d948a91 100644 --- a/module/block/ui/preference.html.php +++ b/module/block/ui/preference.html.php @@ -34,7 +34,7 @@ function printPreference() set::name('URSR'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $config->URSRList )) ), @@ -45,7 +45,7 @@ function printPreference() set::name('programLink'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $lang->my->programLinkList )) ) : null, @@ -56,7 +56,7 @@ function printPreference() set::name('productLink'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $lang->my->productLinkList )) ), @@ -67,7 +67,7 @@ function printPreference() set::name('projectLink'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $lang->my->projectLinkList )) ), @@ -78,7 +78,7 @@ function printPreference() set::name('executionLink'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $lang->my->executionLinkList )) ) diff --git a/module/block/ui/systemmode.html.php b/module/block/ui/systemmode.html.php index 5d51b29dca..27e50fdbf1 100644 --- a/module/block/ui/systemmode.html.php +++ b/module/block/ui/systemmode.html.php @@ -63,7 +63,7 @@ function printSystemMode() set::name('program'), set::control(array ( - 'type' => 'select', + 'type' => 'picker', 'items' => $config->programs )) )