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

Merge branch 'fixbug_liumengyi_32423' into 'master'

Browse Source 
* Fix bug  32423 32540 32157.

See merge request easycorp/zentaopms!7110
This commit is contained in:
孙广明
2023-03-01 07:49:18 +00:00
parent 1290b01c85 aac54b6978
commit 65884c2dd9
9 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+10 -2
View File
@@ -613,7 +613,7 @@ class executionModel extends model
if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end, $execution);
if(dao::isError()) return false;
/* Child stage inherits parent stage permissions. */
@@ -1506,16 +1506,24 @@ class executionModel extends model
* @param int $projectID
* @param string $begin
* @param string $end
* @param object $execution
* @access public
* @return void
*/
public function checkBeginAndEndDate($projectID, $begin, $end)
public function checkBeginAndEndDate($projectID, $begin, $end, $execution = null)
{
$project = $this->loadModel('project')->getByID($projectID);
if(empty($project)) return;
if($begin < $project->begin) dao::$errors['begin'] = sprintf($this->lang->execution->errorCommonBegin, $project->begin);
if($end > $project->end) dao::$errors['end'] = sprintf($this->lang->execution->errorCommonEnd, $project->end);
if(($project->model == 'waterfall' or $project->model == 'waterfallplus') and isset($execution) and $execution->parent != $projectID)
{
$this->app->loadLang('programplan');
$parent = $this->getByID($execution->parent);
if($begin < $parent->begin) dao::$errors['begin'] = sprintf($this->lang->programplan->error->letterParent, $parent->begin);
if($end > $parent->end) dao::$errors['end'] = sprintf($this->lang->programplan->error->greaterParent, $parent->end);
}
}
/*