diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index a20d5afe01..aeb5efe895 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -40,7 +40,7 @@ if($hasCode) ->label($lang->project->category) ->items($lang->project->projectTypeList); - $fields->field('code')->required(); + $fields->field('code')->control('input')->required(); } $fields->field('PM')->control('picker')->items(data('PMUsers')); @@ -52,7 +52,7 @@ $fields->field('begin') ->item(array('control' => 'span', 'text' => '-')) ->itemBegin('end')->control('datePicker')->placeholder($lang->project->end)->required(true)->value(data('project.end'))->itemEnd(); -$fields->field('days')->label($lang->project->days . $lang->project->daysUnit); +$fields->field('days')->label($lang->project->days . $lang->project->daysUnit)->control('input'); $fields->field('products[]') ->wrapBefore() @@ -90,7 +90,6 @@ foreach($budgetUnitList as $key => $value) $budgetItemList[] = array('text' => $value, 'value' => $key, 'url' => "javascript:toggleBudgetUnit('{$key}')"); } - $fields->field('budget') ->label($lang->project->budget . $lang->project->budgetUnit) ->foldable() diff --git a/module/project/ui/create.field.php b/module/project/ui/create.field.php index f65e7145a2..19caf2b739 100644 --- a/module/project/ui/create.field.php +++ b/module/project/ui/create.field.php @@ -44,6 +44,6 @@ if($model == 'waterfall' || $model == 'waterfallplus') $fields->field('stageBy')->className('hidden'); } -$fields->field('acl')->control(array('type' => 'aclBox', 'aclItems' => data('programID') ? $lang->project->subAclList : $lang->project->aclList, 'aclValue' => $copyProject ? data('copyProject.acl') : 'private', 'whitelistLabel' => $lang->project->whitelist)); +$fields->field('acl')->control(array('control' => 'aclBox', 'aclItems' => data('programID') ? $lang->project->subAclList : $lang->project->aclList, 'aclValue' => $copyProject ? data('copyProject.acl') : 'private', 'whitelistLabel' => $lang->project->whitelist)); $fields->field('auth')->value($copyProject ? data('copyProject.auth') : 'extend'); diff --git a/module/project/ui/edit.field.php b/module/project/ui/edit.field.php index 44191a841d..a829ae0aeb 100644 --- a/module/project/ui/edit.field.php +++ b/module/project/ui/edit.field.php @@ -5,6 +5,7 @@ global $lang, $config; $fields = defineFieldList('project.edit', 'project'); +$model = data('model'); $hasCode = !empty($config->setCode); $fields->field('parent')->disabled(data('disableParent')); @@ -13,4 +14,4 @@ if(in_array($model, array('scrum', 'kanban'))) $fields->field('name')->checkbox( $fields->field('hasProduct')->disabled(true); -$fields->field('acl')->control(array('type' => 'aclBox', 'aclItems' => data('programID') ? $lang->project->subAclList : $lang->project->aclList, 'aclValue' => data('project.acl'), 'whitelistLabel' => $lang->project->whitelist)); +$fields->field('acl')->control(array('control' => 'aclBox', 'aclItems' => data('programID') ? $lang->project->subAclList : $lang->project->aclList, 'aclValue' => data('project.acl'), 'whitelistLabel' => $lang->project->whitelist));