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/js/common.ui.js
+2 -1
View File
@@ -477,7 +477,8 @@ function loadProductStories(productID, storyID, moduleID = 0, executionID = 0)
let branch = $('[name="branch"]').val();
if(typeof(branch) == 'undefined') branch = 0;
const link = $.createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + storyID + '&onlyOption=false&status=&limit=0&type=full&hasParent=0&executionID=' + executionID);
let oldStoryID = bug.module == moduleID ? bug.story : 0;
const link = $.createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + oldStoryID + '&onlyOption=false&status=active&limit=0&type=full&hasParent=0&executionID=' + executionID);
$.getJSON(link, function(data)
{
let $storyPicker = $('[name="story"]').zui('picker');
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;
module/story/control.php
+5
View File
@@ -1620,6 +1620,11 @@ class story extends control
}
if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) $stories = $this->story->getProductStoryPairs($productID, $branch, 0, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent);
if($storyID && !isset($stories[$storyID]))
{
$story = $this->story->fetchByID($storyID);
$stories[$storyID] = $story->id . ':' . $story->title;
}
if($isHTML == 0)
{