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

Merge branch '165_package'

Browse Source
This commit is contained in:
王怡栋
2022-04-01 15:30:36 +08:00
parent 39df077d60 92b3b73f6a
commit 4fa721b0bb
60 changed files with 4287 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+6 -3
View File
@@ -246,7 +246,10 @@ class executionModel extends model
$executionID = (int)$this->cookie->lastExecution;
$executionID = in_array($executionID, array_keys($executions)) ? $executionID : key($executions);
}
if($executionID == 0 and $this->session->execution == '') $executionID = key($executions);
if($executionID == 0 and $this->session->execution) $executionID = $this->session->execution;
if($executionID == 0) $executionID = key($executions);
$this->session->set('execution', (int)$executionID, $this->app->tab);
if(!isset($executions[$executionID]))
@@ -683,12 +686,12 @@ class executionModel extends model
$projectID = isset($execution->project) ? $execution->project : $oldExecution->project;
$project = $this->project->getByID($projectID);
if($execution->begin < $project->begin)
if($project and $execution->begin < $project->begin)
{
dao::$errors['begin'] = sprintf($this->lang->execution->errorLetterProject, $project->begin);
return false;
}
if($execution->end > $project->end)
if($project and $execution->end > $project->end)
{
dao::$errors['end'] = sprintf($this->lang->execution->errorGreaterProject, $project->end);
return false;