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

Merge branch 'zentaopms_294'

Browse Source
This commit is contained in:
Yagami
2023-03-06 08:37:11 +08:00
parent eebc016b4a f5699a3420
commit f95691948a
49 changed files with 355 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -3
View File
@@ -384,7 +384,7 @@ class executionModel extends model
$type = 'sprint';
if($project) $type = zget($this->config->execution->modelList, $project->model, 'sprint');
if($project->model == 'waterfall' or $project->model == 'waterfallplus')
if(($project->model == 'waterfall' or $project->model == 'waterfallplus') and isset($this->config->setPercent) and $this->config->setPercent == 1)
{
$this->checkWorkload('create', $_POST['percent'], $project);
if(dao::isError()) return false;
@@ -433,7 +433,7 @@ class executionModel extends model
}
/* Check the workload format and total. */
if(!empty($sprint->percent)) $this->checkWorkload('create', $sprint->percent, $sprint->project);
if(!empty($sprint->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('create', $sprint->percent, $sprint->project);
/* Set planDuration and realDuration. */
if($this->config->edition == 'max')
@@ -622,7 +622,7 @@ class executionModel extends model
$execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->edit['id'], $this->post->uid);
/* Check the workload format and total. */
if(!empty($execution->percent)) $this->checkWorkload('update', $execution->percent, $oldExecution);
if(!empty($execution->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('update', $execution->percent, $oldExecution);
/* Set planDuration and realDuration. */
if($this->config->edition == 'max')