diff --git a/module/common/model.php b/module/common/model.php index 91957915f1..f3ccab9128 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1638,10 +1638,11 @@ EOD; $executionPairs = array(); $userCondition = !$app->user->admin ? " AND `id` " . helper::dbIN($app->user->view->sprints) : ''; $orderBy = $object->type == 'stage' ? 'ORDER BY `id` ASC' : 'ORDER BY `id` DESC'; - $executionList = $app->dbh->query("SELECT id,name FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $userCondition $orderBy")->fetchAll(); + $executionList = $app->dbh->query("SELECT id,name,parent FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $userCondition $orderBy")->fetchAll(); foreach($executionList as $execution) { if($execution->id == $executionID) continue; + if(isset($executionPairs[$execution->parent])) unset($executionPairs[$execution->parent]); $executionPairs[$execution->id] = $execution->name; } diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index e90d561390..84c9520321 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -86,7 +86,7 @@