diff --git a/trunk/module/project/config.php b/trunk/module/project/config.php new file mode 100644 index 0000000000..3ba7ba88ce --- /dev/null +++ b/trunk/module/project/config.php @@ -0,0 +1,3 @@ +project->create->requiredFields = 'name,code,team,begin,end'; +$config->project->edit->requiredFields = 'name,code,team,begin,end'; diff --git a/trunk/module/project/model.php b/trunk/module/project/model.php index dcd4edf3dc..eb3b5ac79a 100644 --- a/trunk/module/project/model.php +++ b/trunk/module/project/model.php @@ -42,6 +42,7 @@ class projectModel extends model /* 新增项目。*/ public function create() { + $this->lang->project->team = $this->lang->project->teamname; $project = fixer::input('post') ->add('company', $this->app->company->id) ->stripTags('name, code, team') @@ -49,7 +50,7 @@ class projectModel extends model ->get(); $this->dao->insert(TABLE_PROJECT)->data($project) ->autoCheck($skipFields = 'begin,end') - ->batchCheck('name,code,team', 'notempty') + ->batchcheck($this->config->project->create->requiredFields, 'notempty') ->checkIF($project->begin != '', 'begin', 'date') ->checkIF($project->end != '', 'end', 'date') ->check('name', 'unique') @@ -61,6 +62,7 @@ class projectModel extends model /* 更新一个项目。*/ public function update($projectID) { + $this->lang->project->team = $this->lang->project->teamname; $projectID = (int)$projectID; $project = fixer::input('post') ->stripTags('name, code, team') @@ -70,7 +72,7 @@ class projectModel extends model ->get(); $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck($skipFields = 'begin,end') - ->batchCheck('name,code,team', 'notempty') + ->batchcheck($this->config->project->edit->requiredFields, 'notempty') ->checkIF($project->begin != '', 'begin', 'date') ->checkIF($project->end != '', 'end', 'date') ->check('name', 'unique', "id!=$projectID") diff --git a/trunk/module/project/view/create.html.php b/trunk/module/project/view/create.html.php index 81296b874a..0e87a0aa90 100644 --- a/trunk/module/project/view/create.html.php +++ b/trunk/module/project/view/create.html.php @@ -30,43 +30,35 @@ project->create;?> project->name;?> - + project->code;?> - + - project->begin;?> - + project->end;?> - + project->teamname;?> - + project->goal;?> - + project->desc;?> - + - - - + diff --git a/trunk/module/project/view/edit.html.php b/trunk/module/project/view/edit.html.php index e7f13a495b..35b2afdcfc 100644 --- a/trunk/module/project/view/edit.html.php +++ b/trunk/module/project/view/edit.html.php @@ -30,43 +30,32 @@ project->edit;?> project->name;?> - + name, "class='text-3'");?> project->code;?> - + code, "class='text-3'");?> - project->begin;?> - + begin, "class='text-3 date'");?> project->end;?> - + end, "class='text-3 date'");?> project->teamname;?> - + team, "class='text-3'");?> - - project->status;?> - project->statusList, $project->status, 'class=text-3');?> - - project->goal;?> - + goal, "rows='5' class='area-1'");?> project->desc;?> - + desc, "rows='5' class='area-1'");?>