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

* Fix bug #17128.

Browse Source
This commit is contained in:
tanghucheng
2021-12-06 15:04:49 +08:00
parent cb23e8ff2b
commit fb84d28b4a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/programplan/lang/en.php
View File

@@ -53,6 +53,10 @@ $lang->programplan->hideCriticalPath = 'Hide Critical Path';
$lang->programplan->showCriticalPath = 'Show Critical Path';
$lang->programplan->errorEnd = "Project end date: %s, end date should be <= project end date.";
$lang->programplan->errorBegin = "Project begin date: %s, begin date should be >= project begin date.";
$lang->programplan->emptyBegin = '『Begin』should not be blank';
$lang->programplan->emptyEnd = '『End』should not be blank';
$lang->programplan->checkBegin = '『Begin』should be valid date';
$lang->programplan->checkEnd = '『End』should be valid date';
$lang->programplan->milestoneList[1] = 'Yes';
$lang->programplan->milestoneList[0] = 'No';

12
module/programplan/model.php
View File

@@ -447,7 +447,7 @@ class programplanModel extends model
dao::$errors['message'][] = $this->lang->programplan->error->percentNumber;
return false;
}
if($plan->begin == '0000-00-00')
if(helper::isZeroDate($plan->begin))
{
dao::$errors['message'][] = $this->lang->programplan->emptyBegin;
return false;
@@ -457,7 +457,7 @@ class programplanModel extends model
dao::$errors['message'][] = $this->lang->programplan->checkBegin;
return false;
}
if($plan->end == '0000-00-00')
if(helper::isZeroDate($plan->end))
{
dao::$errors['message'][] = $this->lang->programplan->emptyEnd;
return false;
@@ -467,7 +467,7 @@ class programplanModel extends model
dao::$errors['message'][] = $this->lang->programplan->checkEnd;
return false;
}
if($plan->end != '0000-00-00' and $plan->end < $plan->begin)
if(!helper::isZeroDate($plan->end) and $plan->end < $plan->begin)
{
dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;
return false;
@@ -482,14 +482,14 @@ class programplanModel extends model
dao::$errors['message'][] = sprintf($this->lang->programplan->errorBegin, $project->begin);
return false;
}
if($plan->end != '0000-00-00' and $plan->end > $project->end)
if(!helper::isZeroDate($plan->end) and $plan->end > $project->end)
{
dao::$errors['message'][] = sprintf($this->lang->programplan->errorEnd, $project->end);
return false;
}
if($plan->begin == '0000-00-00') $plan->begin = '';
if($plan->end == '0000-00-00') $plan->end = '';
if(helper::isZeroDate($plan->begin)) $plan->begin = '';
if(helper::isZeroDate($plan->end)) $plan->end = '';
foreach(explode(',', $this->config->programplan->create->requiredFields) as $field)
{
$field = trim($field);