* Resolve confilict.

This commit is contained in:
liuchenglong
2023-05-06 01:51:00 +00:00
204 changed files with 5528 additions and 4160 deletions
+5 -3
View File
@@ -1,6 +1,11 @@
<?php
declare(strict_types=1);
if(!isset($config->programplan->create)) $config->programplan->create = new stdclass;
$config->programplan->create->form = array();
$config->programplan->create->formFields = array('planIDList', 'names', 'PM', 'percents', 'attributes', 'acl', 'milestone', 'begin', 'end', 'realBegan', 'realEnd', 'desc', 'orders', 'type');
foreach($config->programplan->create->formFields as $field) $config->programplan->create->form[$field] = array('required' => false, 'type' => 'array');
$config->programplan->edit = new stdClass();
$config->programplan->edit->form = array();
$config->programplan->edit->form['begin'] = array('required' => false, 'type' => 'string', 'default' => '0000-00-00');
@@ -9,6 +14,3 @@ $config->programplan->edit->form['realBegan'] = array('required' => false, 'type
$config->programplan->edit->form['realEnd'] = array('required' => false, 'type' => 'string', 'default' => '0000-00-00');
$config->programplan->edit->form['output'] = array('required' => false, 'type' => 'array', 'default' => array());