Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #61177.

Browse Source
This commit is contained in:
tianshujie
2022-07-20 08:36:04 +08:00
parent 35537ff9db
commit f0dec448ce
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/config.php
+1 -1
View File
@@ -137,7 +137,7 @@ $config->project->maxCheckList->waterfall = array('execution', 'design', 'doc',
$config->project->search['module'] = 'project';
$config->project->search['fields']['name'] = $lang->project->name;
$config->project->search['fields']['code'] = $lang->project->code;
if(!isset($config->setCode) or $config->setCode == 1 )$config->project->search['fields']['code'] = $lang->project->code;
$config->project->search['fields']['id'] = $lang->project->id;
$config->project->search['fields']['model'] = $lang->project->model;
$config->project->search['fields']['parent'] = $lang->project->parent;
module/project/model.php
+4 -1
View File
@@ -1570,6 +1570,9 @@ class projectModel extends model
}
if(dao::isError()) return false;
$requiredFields = $this->config->project->edit->requiredFields;
if(isset($this->config->setCode) and $this->config->setCode == 0) $requiredFields = trim(str_replace(',code,', ',', ",{$requiredFields},"), ',');
foreach($projects as $projectID => $project)
{
$oldProject = $oldProjects[$projectID];
@@ -1577,7 +1580,7 @@ class projectModel extends model
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck($skipFields = 'begin,end')
->batchCheck($this->config->project->edit->requiredFields , 'notempty')
->batchCheck($requiredFields, 'notempty')
->checkIF($project->begin != '', 'begin', 'date')
->checkIF($project->end != '', 'end', 'date')
->checkIF($project->end != '', 'end', 'gt', $project->begin)