diff --git a/module/product/zen.php b/module/product/zen.php index 7f5d1a9e29..5ee821e6fc 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -872,14 +872,13 @@ class productZen extends product * Get products of the project. * * @param int $projectID - * @param string $storyType * @param bool $isProjectStory * @access protected * @return array */ - protected function getProjectProductList(int $projectID, string $storyType, bool $isProjectStory): array + protected function getProjectProductList(int $projectID, bool $isProjectStory): array { - if($isProjectStory && $storyType == 'story') return $this->product->getProducts($projectID); + if($isProjectStory) return $this->product->getProducts($projectID); return array(); } @@ -1374,7 +1373,7 @@ class productZen extends product $projectID = $project ? (int)$project->id : 0; $productName = ($isProjectStory && empty($product)) ? $this->lang->product->all : $this->products[$productID]; $storyIdList = $this->getStoryIdList($stories); - $projectProducts = $this->getProjectProductList($projectID, $storyType, $isProjectStory); + $projectProducts = $this->getProjectProductList($projectID, $isProjectStory); list($branchOpt, $branchTagOpt) = $this->getBranchAndTagOption($projectID, $product, $isProjectStory); /* Set show module by config. */ diff --git a/module/tree/model.php b/module/tree/model.php index c0325815b3..d7c605bdfa 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -762,7 +762,7 @@ class treeModel extends model foreach($products as $id => $product) { $extra['productID'] = $id; - $projectProductLink = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all"); + $projectProductLink = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all&browseType=¶m=0&storyType=requirement"); $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&storyType=story&orderBy=&type=byProduct&praram=$id"); $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink; if($productNum > 1)