createLink('product', 'browse', "productID=$productID&branch=$branchID"), "
" . $product->name . $branchName);?>
@@ -155,7 +155,7 @@
$product):?>
- plan as $planID):?>
+ plans as $planID):?>
createLink('productplan', 'view', "planID={$planID}"), $product->name . '/' . $planGroup[$productID][$planID]);?>
diff --git a/module/story/model.php b/module/story/model.php
index 9539d9b3be..46fe149a0b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2417,14 +2417,9 @@ class storyModel extends model
*/
public function getBySearch($productID, $branch = '', $queryID, $orderBy, $executionID = '', $type = 'story', $excludeStories = '', $pager = null)
{
- if(!empty($executionID))
- {
- $products = $this->loadModel('project')->getProducts($executionID);
- }
- else
- {
- $products = $this->loadModel('product')->getProducts();
- }
+ $executionID = empty($executionID) ? 0 : $executionID;
+ $products = $this->loadModel('product')->getProducts($executionID);
+
$query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
/* Get the sql and form status from the query. */
@@ -2449,9 +2444,14 @@ class storyModel extends model
$allBranch = "`branch` = 'all'";
if($executionID != '')
{
- foreach($products as $product) $branches[$product->branch] = $product->branch;
+ $branches = array();
+ foreach($products as $product)
+ {
+ foreach($product->branches as $branchID) $branches[$branchID] = $branchID;
+ }
$branches = join(',', $branches);
if($branches) $storyQuery .= " AND `branch`" . helper::dbIN($branches);
+
if($this->app->moduleName == 'release' or $this->app->moduleName == 'build')
{
$storyQuery .= " AND `status` NOT IN ('draft')"; // Fix bug #990.
diff --git a/module/testcase/control.php b/module/testcase/control.php
index d900def98d..ae077935e8 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -50,12 +50,12 @@ class testcase extends control
if($this->app->tab == 'project')
{
$objectID = $this->session->project;
- $products = $this->loadModel('project')->getProducts($objectID, false);
+ $products = $this->product->getProducts($objectID, 'all', '', false);
}
elseif($this->app->tab == 'execution')
{
$objectID = $this->session->execution;
- $products = $this->loadModel('execution')->getProducts($objectID, false);
+ $products = $this->product->getProducts($objectID, 'all', '', false);
}
else
{
@@ -125,7 +125,7 @@ class testcase extends control
/* Set menu, save session. */
if($this->app->tab == 'project')
{
- $this->products = array('0' => $this->lang->product->all) + $this->loadModel('project')->getProducts($projectID, false);
+ $this->products = array('0' => $this->lang->product->all) + $this->product->getProducts($projectID, 'all', '', false);
$this->loadModel('project')->setMenu($projectID);
}
else