* finish task #2380,2389,2390.

2015-11-11 11:07:59 +08:00
parent 8746d7bc64
commit 45fb1f0c92
18 changed files with 71 additions and 49 deletions
@@ -176,6 +176,7 @@ class bug extends control
        $this->view->moduleID     = $moduleID;
        $this->view->memberPairs  = $memberPairs;
        $this->view->branch       = $branch;
+        $this->view->branches     = $this->loadModel('branch')->getPairs($productID);

        $this->display();
    }
@@ -325,7 +326,7 @@ class bug extends control
        }
        else
        {
-            $builds  = $this->loadModel('build')->getProductBuildPairs($productID, $branch, 'noempty,release,noterminate,nodone');
+            $builds  = $this->loadModel('build')->getProductBuildPairs($productID, $branch, 'noempty,noterminate,nodone');
            $stories = $this->story->getProductStoryPairs($productID, $branch);
        }