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

* Fix bug #32463.

Browse Source
This commit is contained in:
liumengyi
2023-02-28 02:51:14 +00:00
parent 7438d3665b
commit ffe4cdafb2
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+12 -6
View File
@@ -1993,7 +1993,8 @@ class execution extends control
$this->action->logHistory($actionID, $changes);
}
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID, 'edit');
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'edit');
/* Link the plan stories. */
$oldPlans = explode(',', implode(',' ,$oldPlans));
@@ -2289,7 +2290,8 @@ class execution extends control
$this->action->logHistory($actionID, $changes);
}
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID, 'start');
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'start');
$this->loadModel('common')->syncPPEStatus($executionID);
$this->executeHooks($executionID);
@@ -2381,7 +2383,8 @@ class execution extends control
$this->action->logHistory($actionID, $changes);
}
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID, 'suspend');
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'suspend');
$this->executeHooks($executionID);
if(isonlybody() and $from == 'kanban')
@@ -2421,7 +2424,8 @@ class execution extends control
$this->execution->activate($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID, 'activate');
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'activate');
$this->executeHooks($executionID);
if(isonlybody() and $from == 'kanban')
@@ -2469,7 +2473,8 @@ class execution extends control
$this->execution->close($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID, 'close');
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'close');
$this->executeHooks($executionID);
if(isonlybody() and $from == 'kanban')
@@ -3161,7 +3166,8 @@ class execution extends control
$this->execution->updateUserView($executionID);
$this->loadModel('common')->syncPPEStatus($executionID);
if($execution->type == 'stage') $this->loadModel('programplan')->computeProgress($executionID);
$project = $this->loadModel('project')->getById($projectID);
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID);
$this->session->set('execution', '');
$message = $this->executeHooks($executionID);