diff --git a/module/story/model.php b/module/story/model.php index 4f022b8fb3..3185b244fc 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4061,9 +4061,25 @@ class storyModel extends model if(count($tracks) < $pager->recPerPage) { + /* Show of child story */ + $storiesCopy = array(); + foreach($stories as $id => $story) + { + $storiesCopy[$id] = $story; + if(isset($story->children) and count($story->children) > 0) + { + foreach($story->children as $childID => $children) + { + $storiesCopy[$childID] = $children; + } + } + } + $stories = $storiesCopy; + foreach($stories as $id => $story) { $stories[$id] = new stdclass(); + $stories[$id]->parent = $story->parent; $stories[$id]->title = $story->title; $stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id); $stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id); diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php index 90ca4f0f08..b5a5320a3e 100644 --- a/module/story/view/track.html.php +++ b/module/story/view/track.html.php @@ -69,7 +69,10 @@ $story):?> ';?> - createLink($module, 'view', "storyID=$storyID"), $story->title, '',"title='$story->title' data-app='$openApp'");?> + + parent > 0):?>lang->story->childrenAB;?> + createLink($module, 'view', "storyID=$storyID"), $story->title, '',"title='$story->title' data-app='$openApp'");?> + tasks as $taskID => $task):?> createLink('task', 'view', "taskID=$taskID"), $task->name, '', "title='$task->name'") . '
';?>