diff --git a/module/bug/ui/batchcreate.html.php b/module/bug/ui/batchcreate.html.php
index b09a2e0d07..ef42d4223a 100644
--- a/module/bug/ui/batchcreate.html.php
+++ b/module/bug/ui/batchcreate.html.php
@@ -83,10 +83,10 @@ $items[] = array('name' => 'steps', 'label' => $lang->bug->steps, 'width' => '24
$items[] = array('name' => 'type', 'label' => $lang->typeAB, 'control' => 'picker', 'items' => $lang->bug->typeList, 'value' => '', 'width' => '160px', 'required' => isset($requiredFields['type']), 'ditto' => true);
/* Field of pri. */
-$items[] = array('name' => 'pri', 'label' => $lang->bug->pri, 'control' => array('type' => 'priPicker', 'required' => true), 'items' => $lang->bug->priList, 'value' => 3, 'width' => '100px', 'required' => isset($requiredFields['pri']), 'ditto' => true);
+$items[] = array('name' => 'pri', 'label' => $lang->bug->pri, 'control' => array('control' => 'priPicker', 'required' => true), 'items' => $lang->bug->priList, 'value' => 3, 'width' => '100px', 'required' => isset($requiredFields['pri']), 'ditto' => true);
/* Field of severity. */
-$items[] = array('name' => 'severity', 'label' => $lang->bug->severity, 'control' => array('type' => 'severityPicker', 'required' => true), 'items' => $lang->bug->severityList, 'value' => 3, 'width' => '80px', 'required' => isset($requiredFields['severity']));
+$items[] = array('name' => 'severity', 'label' => $lang->bug->severity, 'control' => array('control' => 'severityPicker', 'required' => true), 'items' => $lang->bug->severityList, 'value' => 3, 'width' => '80px', 'required' => isset($requiredFields['severity']));
/* Field of os. */
$items[] = array('name' => 'os', 'label' => $lang->bug->os, 'control' => 'picker', 'items' => $lang->bug->osList, 'width' => '200px', 'multiple' => true, 'required' => isset($requiredFields['os']));
diff --git a/module/product/ui/batchedit.html.php b/module/product/ui/batchedit.html.php
index 1241b5831c..8c84337a27 100644
--- a/module/product/ui/batchedit.html.php
+++ b/module/product/ui/batchedit.html.php
@@ -19,7 +19,7 @@ foreach($fields as $fieldName => $field)
$items[$fieldName] = array('name' => $fieldName, 'label' => $field['title'], 'control' => $field['control'], 'width' => $field['width'], 'required' => $field['required'], 'items' => zget($field, 'options', array()));
if($items[$fieldName]['control'] == 'select') $items[$fieldName]['control'] = 'picker';
}
-$items['acl']['control'] = array('type' => $items['acl']['control'], 'inline' => true);
+$items['acl']['control'] = array('control' => $items['acl']['control'], 'inline' => true);
$extendFields = $this->product->getFlowExtendFields();
foreach($extendFields as $extendField)
diff --git a/module/product/ui/common.field.php b/module/product/ui/common.field.php
index d436f09f3b..496d53d044 100644
--- a/module/product/ui/common.field.php
+++ b/module/product/ui/common.field.php
@@ -21,7 +21,7 @@ if($config->systemMode != 'light')
$fields->field('name')->wrapBefore()->required()->control('input');
$fields->field('type')
- ->control(array('type' => 'picker', 'required' => true))
+ ->control(array('control' => 'picker', 'required' => true))
->items(data('fields.type.options'))
->value(data('fields.type.default'));
@@ -55,4 +55,4 @@ $fields->field('desc')
$fields->field('acl')
->width('full')
- ->control(array('type' => 'aclBox', 'aclItems' => data('fields.acl.options'), 'aclValue' => data('fields.acl.default'),'whitelistLabel' => $lang->product->whitelist, 'aclValue' => data('fields.acl.default'), 'userValue' => data('fields.whitelist.default')));
+ ->control(array('control' => 'aclBox', 'aclItems' => data('fields.acl.options'), 'aclValue' => data('fields.acl.default'),'whitelistLabel' => $lang->product->whitelist, 'aclValue' => data('fields.acl.default'), 'userValue' => data('fields.whitelist.default')));
diff --git a/module/repo/ui/import.html.php b/module/repo/ui/import.html.php
index c528b95278..0b6962fac6 100644
--- a/module/repo/ui/import.html.php
+++ b/module/repo/ui/import.html.php
@@ -15,8 +15,8 @@ $items[] = array('name' => 'no', 'label' => $lang->user->abbr->id, 'control' =>
$items[] = array('name' => 'serviceProject', 'label' => '', 'hidden' => true);
$items[] = array('name' => 'name_with_namespace', 'label' => $lang->repo->repo, 'control' => 'static', 'width' => '264px');
$items[] = array('name' => 'name', 'label' => $lang->repo->importName);
-$items[] = array('name' => 'product', 'label' => $lang->repo->product, 'control' => array('type' => 'picker', 'multiple' => true), 'items' => $products);
-$items[] = array('name' => 'projects', 'label' => $lang->repo->projects, 'control' => array('type' => 'picker', 'multiple' => true), 'items' => $projects);
+$items[] = array('name' => 'product', 'label' => $lang->repo->product, 'control' => array('control' => 'picker', 'multiple' => true), 'items' => $products);
+$items[] = array('name' => 'projects', 'label' => $lang->repo->projects, 'control' => array('control' => 'picker', 'multiple' => true), 'items' => $projects);
$no = 1;
foreach($repoList as $repo)
diff --git a/module/story/config/form.php b/module/story/config/form.php
index e2a98cecf2..c4c88f77dd 100644
--- a/module/story/config/form.php
+++ b/module/story/config/form.php
@@ -90,13 +90,13 @@ $config->story->form->batchCreate['mailto'] = array('ditto' => false, 'type'
$config->story->form->batchEdit = array();
$config->story->form->batchEdit['branch'] = array('type' => 'int', 'width' => '200px', 'control' => 'picker', 'required' => false, 'default' => 0, 'options' => array());
-$config->story->form->batchEdit['module'] = array('type' => 'int', 'width' => '200px', 'control' => array('type' => 'picker', 'required' => true), 'required' => false, 'default' => 0, 'options' => array());
+$config->story->form->batchEdit['module'] = array('type' => 'int', 'width' => '200px', 'control' => array('control' => 'picker', 'required' => true), 'required' => false, 'default' => 0, 'options' => array());
$config->story->form->batchEdit['plan'] = array('type' => 'int', 'width' => '200px', 'control' => 'picker', 'required' => false, 'default' => 0, 'options' => array());
-$config->story->form->batchEdit['title'] = array('type' => 'string', 'width' => '240px', 'control' => array('type' => 'colorInput', 'inputClass' => 'filter-none'), 'required' => true, 'filter' => 'trim', 'base' => true);
+$config->story->form->batchEdit['title'] = array('type' => 'string', 'width' => '240px', 'control' => array('control' => 'colorInput', 'inputClass' => 'filter-none'), 'required' => true, 'filter' => 'trim', 'base' => true);
$config->story->form->batchEdit['color'] = array('type' => 'string', 'control' => 'color', 'required' => false, 'default' => '', 'filter' => 'trim');
$config->story->form->batchEdit['estimate'] = array('type' => 'float', 'width' => '76px', 'control' => 'text', 'required' => false, 'default' => '0');
$config->story->form->batchEdit['category'] = array('type' => 'string', 'width' => '160px', 'control' => 'picker', 'required' => false, 'default' => 'feature', 'options' => array_filter($lang->story->categoryList));
-$config->story->form->batchEdit['pri'] = array('type' => 'string', 'width' => '92px', 'control' => array('type' => 'picker', 'required' => true), 'required' => false, 'default' => $config->story->defaultPriority, 'options' => array_filter($lang->story->priList));
+$config->story->form->batchEdit['pri'] = array('type' => 'string', 'width' => '92px', 'control' => array('control' => 'picker', 'required' => true), 'required' => false, 'default' => $config->story->defaultPriority, 'options' => array_filter($lang->story->priList));
$config->story->form->batchEdit['assignedTo'] = array('type' => 'string', 'width' => '136px', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => 'users');
$config->story->form->batchEdit['source'] = array('type' => 'string', 'width' => '160px', 'control' => 'picker', 'required' => false, 'default' => '', 'options' => array_filter($lang->story->sourceList));
$config->story->form->batchEdit['sourceNote'] = array('type' => 'string', 'width' => '200px', 'control' => 'text', 'required' => false, 'default' => '', 'filter' => 'trim');
diff --git a/module/task/ui/create.field.php b/module/task/ui/create.field.php
index e9bbdc34be..bd1b79cac6 100644
--- a/module/task/ui/create.field.php
+++ b/module/task/ui/create.field.php
@@ -7,7 +7,7 @@ $fields = defineFieldList('task.create', 'task');
/* Set module field. */
$fields->field('module')
->checkbox(array('text' => $lang->task->allModule, 'name' => 'isShowAllModule', 'checked' => data('showAllModule')))
- ->control(array('type' => 'picker', 'required' => true))
+ ->control(array('control' => 'picker', 'required' => true))
->items(data('modulePairs'))
->value(data('task.module'));
@@ -182,7 +182,7 @@ if(!isAjaxRequest('modal'))
$fields->field('after')
->label($lang->task->afterSubmit)
->width('full')
- ->control(array('type' => 'radioList', 'inline' => true))
+ ->control(array('control' => 'radioList', 'inline' => true))
->value(data('task.id') ? 'continueAdding' : 'toTaskList')
->items(empty(data('features.story')) ? array('toTaskList' => $lang->task->afterChoices['toTaskList']) : $config->task->afterOptions);
}
diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php
index 1cf6e1e9a4..f25c57ca19 100644
--- a/module/testcase/config/table.php
+++ b/module/testcase/config/table.php
@@ -265,7 +265,7 @@ $config->testcase->importfromlib->dtable->fieldList['id']['fixed'] = false;
$config->testcase->importfromlib->dtable->fieldList['branch']['name'] = 'branch';
$config->testcase->importfromlib->dtable->fieldList['branch']['title'] = $lang->testcase->branch;
$config->testcase->importfromlib->dtable->fieldList['branch']['type'] = 'control';
-$config->testcase->importfromlib->dtable->fieldList['branch']['control'] = array('type' => 'picker', 'props' => array('required' => true));
+$config->testcase->importfromlib->dtable->fieldList['branch']['control'] = array('control' => 'picker', 'props' => array('required' => true));
$config->testcase->importfromlib->dtable->fieldList['branch']['width'] = '200px';
$config->testcase->importfromlib->dtable->fieldList['pri']['name'] = 'pri';
@@ -286,7 +286,7 @@ $config->testcase->importfromlib->dtable->fieldList['fromModule']['type'] = 'ca
$config->testcase->importfromlib->dtable->fieldList['module']['name'] = 'module';
$config->testcase->importfromlib->dtable->fieldList['module']['title'] = $lang->testcase->module;
$config->testcase->importfromlib->dtable->fieldList['module']['type'] = 'control';
-$config->testcase->importfromlib->dtable->fieldList['module']['control'] = array('type' => 'picker', 'props' => "RAWJSRAWJS");
+$config->testcase->importfromlib->dtable->fieldList['module']['control'] = array('control' => 'picker', 'props' => "RAWJSRAWJS");
$config->testcase->importfromlib->dtable->fieldList['module']['width'] = '200px';
$config->testcase->importfromlib->dtable->fieldList['type']['name'] = 'type';
diff --git a/module/testcase/ui/batchcreate.html.php b/module/testcase/ui/batchcreate.html.php
index 455d095edf..97f1d049bb 100644
--- a/module/testcase/ui/batchcreate.html.php
+++ b/module/testcase/ui/batchcreate.html.php
@@ -63,7 +63,7 @@ $items[] = array
'name' => 'module',
'label' => $lang->testcase->module,
'hidden' => zget($visibleFields, 'module', true, false),
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => $moduleOptionMenu,
'value' => $currentModuleID,
'width' => '200px',
@@ -77,7 +77,7 @@ $items[] = array
'name' => 'scene',
'label' => $lang->testcase->scene,
'hidden' => zget($visibleFields, 'scene', true, false),
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => $sceneOptionMenu,
'value' => $currentSceneID,
'width' => '200px',
diff --git a/module/testcase/ui/batchedit.html.php b/module/testcase/ui/batchedit.html.php
index 54e6c352ce..0dfba1eedc 100644
--- a/module/testcase/ui/batchedit.html.php
+++ b/module/testcase/ui/batchedit.html.php
@@ -65,7 +65,7 @@ else
'name' => 'pri',
'label' => $lang->priAB,
'width' => '100px',
- 'control' => array('type' => 'priPicker', 'required' => true),
+ 'control' => array('control' => 'priPicker', 'required' => true),
'items' => $lang->testcase->priList,
'ditto' => true,
'hidden' => !isset($visibleFields['pri']),
@@ -77,7 +77,7 @@ else
'name' => 'status',
'label' => $lang->statusAB,
'width' => '120px',
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => $lang->testcase->statusList,
'hidden' => !isset($visibleFields['status']),
'required' => isset($requiredFields['status'])
@@ -96,7 +96,7 @@ else
'name' => 'module',
'label' => $lang->testcase->module,
'width' => '180px',
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => array(),
'hidden' => !isset($visibleFields['module']),
'required' => isset($requiredFields['module'])
@@ -106,7 +106,7 @@ else
'name' => 'scene',
'label' => $lang->testcase->scene,
'width' => '180px',
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => array(),
'hidden' => ($isLibCase || !isset($visibleFields['scene'])),
'required' => isset($requiredFields['scene'])
@@ -136,7 +136,7 @@ else
'name' => 'type',
'label' => $lang->testcase->type,
'width' => '140px',
- 'control' => array('type' => 'picker', 'required' => true),
+ 'control' => array('control' => 'picker', 'required' => true),
'items' => $lang->testcase->typeList,
'ditto' => true,
'required' => isset($requiredFields['type']),
diff --git a/module/testcase/ui/create.field.php b/module/testcase/ui/create.field.php
index 8a9d133ed9..4784be5c81 100644
--- a/module/testcase/ui/create.field.php
+++ b/module/testcase/ui/create.field.php
@@ -29,7 +29,7 @@ $fields->field('story')
->itemBegin()->control('btn', array('url' => helper::createLink('story', 'view', 'storyID=' . data('case.story')), 'data-toggle' => 'modal', 'data-size' => 'lg'))->className('hidden', empty(data('case.story')))->icon('eye text-primary')->hint($lang->preview)->id('preview')->itemEnd();
$fields->field('scene')
- ->control(array('type' => 'picker', 'required' => true))
+ ->control(array('control' => 'picker', 'required' => true))
->items(data('sceneOptionMenu'))
->value(data('currentSceneID'));
diff --git a/module/user/config/form.php b/module/user/config/form.php
index c4bcca43af..1a0e2b45fa 100644
--- a/module/user/config/form.php
+++ b/module/user/config/form.php
@@ -81,14 +81,14 @@ $config->user->form->edit['passwordLength'] = array('required' => false, 'type
$config->user->form->edit['passwordStrength'] = array('required' => false, 'type' => 'int', 'default' => 0);
$config->user->form->batchEdit = array();
-$config->user->form->batchEdit['dept'] = array('required' => false, 'type' => 'int', 'width' => '200px', 'name' => 'dept', 'label' => $lang->user->dept, 'control' => array('type' => 'picker', 'required' => true), 'default' => 0, 'ditto' => true);
+$config->user->form->batchEdit['dept'] = array('required' => false, 'type' => 'int', 'width' => '200px', 'name' => 'dept', 'label' => $lang->user->dept, 'control' => array('control' => 'picker', 'required' => true), 'default' => 0, 'ditto' => true);
$config->user->form->batchEdit['company'] = array('required' => false, 'type' => 'int', 'width' => '200px', 'name' => 'company', 'label' => $lang->user->company, 'control' => 'picker', 'default' => 0);
$config->user->form->batchEdit['account'] = array('required' => true, 'type' => 'string', 'width' => '140px', 'name' => 'account', 'label' => $lang->user->account, 'control' => 'text', 'default' => '', 'readonly' => true, 'base' => true);
$config->user->form->batchEdit['realname'] = array('required' => true, 'type' => 'string', 'width' => '96px', 'name' => 'realname', 'label' => $lang->user->realname, 'control' => 'text', 'default' => '');
$config->user->form->batchEdit['visions'] = array('required' => true, 'type' => 'array', 'width' => '240px', 'name' => 'visions', 'label' => $lang->user->visions, 'control' => 'picker', 'default' => [], 'multiple' => true, 'filter' => 'join');
$config->user->form->batchEdit['role'] = array('required' => false, 'type' => 'string', 'width' => '160px', 'name' => 'role', 'label' => $lang->user->role, 'control' => 'picker', 'default' => '', 'ditto' => true, 'items' => $lang->user->roleList);
$config->user->form->batchEdit['email'] = array('required' => false, 'type' => 'string', 'width' => '160px', 'name' => 'email', 'label' => $lang->user->email, 'control' => 'text', 'default' => '');
-$config->user->form->batchEdit['gender'] = array('required' => false, 'type' => 'string', 'width' => '100px', 'name' => 'gender', 'label' => $lang->user->gender, 'control' => array('type' => 'radioList', 'inline' => true), 'default' => 'm', 'items' => $lang->user->genderList);
+$config->user->form->batchEdit['gender'] = array('required' => false, 'type' => 'string', 'width' => '100px', 'name' => 'gender', 'label' => $lang->user->gender, 'control' => array('control' => 'radioList', 'inline' => true), 'default' => 'm', 'items' => $lang->user->genderList);
$config->user->form->batchEdit['commiter'] = array('required' => false, 'type' => 'string', 'width' => '120px', 'name' => 'commiter', 'label' => $lang->user->commiter, 'control' => 'text', 'default' => '');
$config->user->form->batchEdit['join'] = array('required' => false, 'type' => 'date', 'width' => '120px', 'name' => 'join', 'label' => $lang->user->join, 'control' => 'date', 'default' => '');
$config->user->form->batchEdit['mobile'] = array('required' => false, 'type' => 'string', 'width' => '120px', 'name' => 'mobile', 'label' => $lang->user->mobile, 'control' => 'text', 'default' => '');