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

* Fix bug #35262.

Browse Source
This commit is contained in:
tanghucheng
2023-05-19 05:20:41 +00:00
parent 310d370298
commit cb13492e95
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -2489,7 +2489,7 @@ class execution extends control
if(dao::isError()) return print(js::error(dao::getError()));
$project = $this->loadModel('project')->getById($execution->project);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'close');
if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) $this->loadModel('programplan')->computeProgress($executionID, 'close');
$this->executeHooks($executionID);
if(isonlybody() and $from == 'kanban')
module/execution/model.php
+2 -2
View File
@@ -5305,7 +5305,7 @@ class executionModel extends model
$title = '';
$disabled = '';
if($project and $project->model == 'ipd')
if($project and $project->model == 'ipd' and !$isChild)
{
$this->app->loadLang('stage');
$title = $execution->ipdStage['canStart'] ? '' : sprintf($this->lang->execution->disabledTip->startTip, $this->lang->stage->ipdTypeList[$execution->ipdStage['preAttribute']], $this->lang->stage->ipdTypeList[$execution->attribute]);
@@ -5340,7 +5340,7 @@ class executionModel extends model
{
$ipdDisabled = '';
$title = $this->lang->execution->close;
if(isset($execution->ipdStage['canClose']) and !$execution->ipdStage['canClose'])
if(isset($execution->ipdStage['canClose']) and !$execution->ipdStage['canClose'] and !$isChild)
{
$ipdDisabled = ' disabled ';
$title = $execution->attribute == 'launch' ? $this->lang->execution->disabledTip->launchTip : $this->lang->execution->disabledTip->closeTip;
module/programplan/model.php
+2 -2
View File
@@ -434,7 +434,7 @@ class programplanModel extends model
$data->parent = $plan->id;
$data->open = true;
$data->start_date = $end;
$data->endDate = $end;
$data->endDate = $end;
$data->duration = 1;
$data->color = isset($this->lang->programplan->reviewColorList[$point->status]) ? $this->lang->programplan->reviewColorList[$point->status] : '#FC913F';
$data->progressColor = $this->lang->execution->gantt->stage->progressColor;
@@ -1618,7 +1618,7 @@ class programplanModel extends model
{
$stage = $this->loadModel('execution')->getByID($stageID);
$project = $this->loadModel('project')->getByID($stage->project);
if(empty($stage) or empty($stage->path) or ($project->model != 'waterfall' and $project->model != 'waterfallplus')) return false;
if(empty($stage) or empty($stage->path) or (!in_array($project->model, array('waterfall','waterfallplus','ipd')))) return false;
$this->loadModel('execution');
$this->loadModel('action');