diff --git a/module/build/model.php b/module/build/model.php index 070e6a0dc0..7cc98fffb1 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -111,7 +111,7 @@ class buildModel extends model { if($build->project) { - $builds[$key] = isset($releases[$key]) ? $releases[$key]->name : $build->name; + $builds[$key] = $build->name; } else if(isset($releases[$key]) and !$releases[$key]->deleted) { diff --git a/module/release/control.php b/module/release/control.php index 7ab242d329..ce537f2f45 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -125,8 +125,7 @@ class release extends control $this->view->build = $build; $this->view->stories = $stories; $this->view->bugs = $bugs; - $this->view->builds = $this->loadModel('build')->getProductBuildPairs($release->product); - unset($this->view->builds['trunk']); + $this->view->builds = $this->loadModel('build')->getProductBuildPairs($release->product, 'notrunk'); $this->display(); }