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

* Fix bug #43050.

Browse Source
This commit is contained in:
chaideqing
2024-01-09 11:40:06 +08:00
parent 87aec3072e
commit e8c2e5a0b6
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -952,7 +952,7 @@ class execution extends control
}
else
{
$moduleTree = $this->tree->getProjectStoryTreeMenu($executionID, 0, array('treeModel', $createModuleLink));
$moduleTree = $this->tree->getProjectStoryTreeMenu($executionID, 0, array('treeModel', $createModuleLink), $storyType);
}
$executionProductList = $this->loadModel('product')->getProducts($executionID);
module/product/control.php
+1 -1
View File
@@ -225,7 +225,7 @@ class product extends control
/* If in project story and not chose product, get project story mdoules. */
if($isProjectStory and empty($productID))
{
$moduleTree = $this->tree->getProjectStoryTreeMenu($projectID, 0, array('treeModel', $createModuleLink));
$moduleTree = $this->tree->getProjectStoryTreeMenu($projectID, 0, array('treeModel', $createModuleLink), $storyType);
}
else
{
module/tree/model.php
+4 -3
View File
@@ -829,10 +829,11 @@ class treeModel extends model
* @param int $rootID
* @param int $startModule
* @param string $userFunc
* @param string $storyType
* @access public
* @return string
*/
public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc = '')
public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc = '', $storyType = 'story')
{
$this->app->loadLang('branch');
@@ -856,8 +857,8 @@ class treeModel extends model
foreach($products as $id => $product)
{
$extra['productID'] = $id;
$projectProductLink = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all");
$executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&storyType=story&orderBy=&type=byProduct&praram=$id");
$projectProductLink = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all&browseType=&param=0&storyType=$storyType");
$executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&storyType=$storyType&orderBy=&type=byProduct&praram=$id");
$link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' title=$product");