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

* [bug#57252,done,1h] fix error problem with story drop-down range.

Browse Source
This commit is contained in:
tianshujie
2025-01-22 10:22:07 +08:00
committed by 曹延义
parent 65b6d98bac
commit b2b4dc8fda
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/zen.php
+19 -2
View File
@@ -1036,8 +1036,16 @@ class bugZen extends bug
}
else
{
$stories = $this->story->getProductStoryPairs($productID, $branch, $moduleID, 'active,closed', 'id_desc', 0, '', 'story', false);
$moduleIdList = $moduleID;
if($moduleIdList)
{
$moduleIdList = $this->loadModel('tree')->getStoryModule($moduleIdList);
$moduleIdList = $this->tree->getAllChildID($moduleIdList);
}
$stories = $this->story->getProductStoryPairs($productID, $branch, $moduleIdList, 'active,closed', 'id_desc', 0, '', 'story', false);
}
if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) $stories = $this->story->getProductStoryPairs($productID, $branch, 0, 'active', 'id_desc', 0, '', 'story', false);
if(!isset($stories[$bug->storyID]))
{
@@ -1265,8 +1273,17 @@ class bugZen extends bug
}
else
{
$stories = $this->story->getProductStoryPairs($bug->product, $bug->branch, 0, 'active,closed', 'id_desc', 0, '', 'story', false);
$moduleIdList = $bug->module;
if($moduleIdList)
{
$moduleIdList = $this->loadModel('tree')->getStoryModule($moduleIdList);
$moduleIdList = $this->tree->getAllChildID($moduleIdList);
}
$stories = $this->story->getProductStoryPairs($bug->product, $bug->branch, $moduleIdList, 'active', 'id_desc', 0, '', 'story', false);
}
if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) $stories = $this->story->getProductStoryPairs($bug->product, $bug->branch, 0, 'active', 'id_desc', 0, '', 'story', false);
if(!isset($stories[$bug->story])) $stories[$bug->story] = $bug->story . ':' . $bug->storyTitle;
$resolvedBuildPairs = $this->build->getBuildPairs(array($bug->product), $bug->branch, 'noempty');
$this->view->resolvedBuildPairs = $resolvedBuildPairs;