From 2c15082d147a64ab8d4e0a60f873bbe96e43ba30 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Fri, 9 Aug 2013 09:54:19 +0800 Subject: [PATCH] * resloved bugs first in build. --- module/build/control.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index a7fee06533..3e98a90e95 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -39,13 +39,23 @@ class build extends control $this->project->setMenu($this->project->getPairs(), $projectID); /* Get stories and bugs. */ - $orderBy = 'status_asc, stage_asc, id_desc'; - $stories = $this->story->getProjectStories($projectID, $orderBy); - $bugs = $this->bug->getProjectBugs($projectID); - foreach($bugs as $key => $bug) + $orderBy = 'status_asc, stage_asc, id_desc'; + $stories = $this->story->getProjectStories($projectID, $orderBy); + $projectBugs = $this->bug->getProjectBugs($projectID); + $bugs = array(); + foreach($projectBugs as $key => $bug) { - if($bug->status == 'closed') unset($bugs[$key]); + if($bug->status == 'resolved') + { + $bugs[$key] = $bug; + unset($projectBugs[$key]); + } + else if($bug->status == 'closed') + { + unset($projectBugs[$key]); + } } + $bugs += $projectBugs; /* Assign. */ $project = $this->loadModel('project')->getById($projectID);