diff --git a/module/execution/ui/edit.html.php b/module/execution/ui/edit.html.php index d1bdbcd2de..30e6a3c38b 100644 --- a/module/execution/ui/edit.html.php +++ b/module/execution/ui/edit.html.php @@ -68,9 +68,9 @@ if(isset($project)) } $typeBox = null; -if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) +if(in_array($project->model, array('waterfall', 'waterfallplus'))) { - $typeList = $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList; + $typeList = $lang->stage->typeList; $typeBox = formRow ( formGroup @@ -102,7 +102,7 @@ if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) ) ); } -elseif($execution->type != 'kanban') +elseif($execution->type != 'kanban' and $project->model != 'ipd') { $typeBox = formRow ( diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 1f035fcede..ce3764a723 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -87,7 +87,7 @@ - model, array('waterfall', 'waterfallplus', 'ipd'))):?> + model, array('waterfall', 'waterfallplus'))):?>