diff --git a/module/bug/js/common.ui.js b/module/bug/js/common.ui.js index 644af5f035..2605cb5831 100644 --- a/module/bug/js/common.ui.js +++ b/module/bug/js/common.ui.js @@ -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'); diff --git a/module/bug/zen.php b/module/bug/zen.php index 1f78782585..35a4002cd7 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -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); diff --git a/module/story/control.php b/module/story/control.php index 4a3c110815..2c647837d4 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -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)