diff --git a/module/project/config.php b/module/project/config.php index afdbdb0d11..5daf775b45 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -8,8 +8,8 @@ global $lang, $app; $app->loadLang('task'); $config->project->create = new stdclass(); $config->project->edit = new stdclass(); -$config->project->create->requiredFields = 'name,code,team,begin,end'; -$config->project->edit->requiredFields = 'name,code,team,begin,end'; +$config->project->create->requiredFields = 'name,code,begin,end'; +$config->project->edit->requiredFields = 'name,code,begin,end'; $config->project->editor = new stdclass(); $config->project->editor->create = array('id' => 'desc,goal', 'tools' => 'simpleTools'); diff --git a/module/project/model.php b/module/project/model.php index d674ed82c8..560fc9a46f 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -213,6 +213,7 @@ class projectModel extends model ->stripTags('name, code, team') ->setIF($this->post->acl != 'custom', 'whitelist', '') ->setDefault('openedVersion', $this->config->version) + ->setDefault('team', $this->post->name) ->join('whitelist', ',') ->remove('products, workDays, delta') ->get(); @@ -280,6 +281,7 @@ class projectModel extends model ->setIF($this->post->begin == '0000-00-00', 'begin', '') ->setIF($this->post->end == '0000-00-00', 'end', '') ->setIF($this->post->acl != 'custom', 'whitelist', '') + ->setDefault('team', $this->post->name) ->join('whitelist', ',') ->remove('products') ->get();