Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#48627,#48628.

Browse Source
This commit is contained in:
xieqiyu
2024-04-28 16:40:55 +08:00
parent 7611f4d200
commit 0a338f0fa6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/zen.php
+3 -4
View File
@@ -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. */
module/tree/model.php
+1 -1
View File
@@ -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=&param=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)