diff --git a/module/common/model.php b/module/common/model.php index 3dc3bd0bde..56ab529ab7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1791,8 +1791,12 @@ 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,parent,project FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $userCondition $orderBy")->fetchAll(); - $executionList = $app->control->loadModel('execution')->resetExecutionSorts($executionList); + $executions = array(); + foreach($executionList as $execution) $executions[$execution->id] = $execution; + + $executionList = $app->control->loadModel('execution')->resetExecutionSorts($executions); foreach($executionList as $execution) { if(isset($executionPairs[$execution->parent])) unset($executionPairs[$execution->parent]);