diff --git a/module/product/model.php b/module/product/model.php index d758bf78d3..bd82f04955 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -193,6 +193,13 @@ class productModel extends model return $pairs; } + /** + * Get products by project. + * + * @param int $projectID + * @access public + * @return array + */ public function getProductsByProject($projectID) { return $this->dao->select('t1.product, t2.name') diff --git a/module/story/model.php b/module/story/model.php index e2509c0469..9c82bc0b37 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -701,6 +701,7 @@ class storyModel extends model */ public function getBySearch($productID, $queryID, $orderBy, $pager) { + $products = $this->loadModel('product')->getPairs(); $query = $queryID ? $this->loadModel('search')->getQuery($queryID) : ''; /* Get the sql and form status from the query. */ @@ -719,6 +720,7 @@ class storyModel extends model $storyQuery = str_replace($allProduct, '1', $this->session->storyQuery); $queryProductID = 'all'; } + $storyQuery = $storyQuery . 'AND `product`' . helper::dbIN(array_keys($products)); return $this->getBySQL($queryProductID, $storyQuery, $orderBy, $pager); }