diff --git a/module/execution/control.php b/module/execution/control.php index 6f37a5bd1f..4ef25ecea8 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1501,7 +1501,7 @@ class execution extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => 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); diff --git a/module/programplan/model.php b/module/programplan/model.php index 0e65e2bd02..2c1df0c0d4 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -1209,7 +1209,7 @@ class programplanModel extends model if(empty($stage) || empty($stage->path)) return false; $project = $this->loadModel('project')->getByID($stage->project); - if(isset($project->model) && $project->model != 'waterfall' && $project->model != 'waterfallplus') return false; + if(empty($stage) or empty($stage->path) or (!in_array($project->model, array('waterfall','waterfallplus','ipd')))) return false; $action = strtolower($action); $parentIdList = explode(',', trim($stage->path, ','));