* [bug#57252,done,1h] fix story range.
This commit is contained in:
@@ -477,8 +477,7 @@ function loadProductStories(productID, storyID, moduleID = 0, executionID = 0)
|
||||
let branch = $('[name="branch"]').val();
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
|
||||
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);
|
||||
const link = $.createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + storyID + '&onlyOption=false&status=active&limit=0&type=full&hasParent=0&executionID=' + executionID);
|
||||
$.getJSON(link, function(data)
|
||||
{
|
||||
let $storyPicker = $('[name="story"]').zui('picker');
|
||||
|
||||
@@ -1046,11 +1046,6 @@ class bugZen extends bug
|
||||
$stories = $this->story->getProductStoryPairs($productID, $branch, $moduleIdList, 'active', 'id_desc', 0, '', 'story', false);
|
||||
}
|
||||
|
||||
if(!isset($stories[$bug->storyID]))
|
||||
{
|
||||
$bugStory = $this->story->fetchById($bug->storyID);
|
||||
$bugStory ? $stories[$bug->storyID] = $bugStory->title : $bug->storyID = 0;
|
||||
}
|
||||
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);
|
||||
|
||||
$stories = $this->story->addGradeLabel($stories);
|
||||
|
||||
@@ -1618,12 +1618,6 @@ class story extends control
|
||||
{
|
||||
$stories = $this->story->getProductStoryPairs($productID, $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent);
|
||||
}
|
||||
|
||||
if($storyID && !isset($stories[$storyID]))
|
||||
{
|
||||
$story = $this->story->fetchByID($storyID);
|
||||
$stories[$storyID] = $story->id . ':' . $story->title;
|
||||
}
|
||||
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($isHTML == 0)
|
||||
|
||||
Reference in New Issue
Block a user