diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php index 730ec975aa..eff80fceba 100644 --- a/module/execution/ui/story.html.php +++ b/module/execution/ui/story.html.php @@ -381,13 +381,15 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC foreach($stories as $story) { $story->moduleID = $story->module; - $story = $this->story->formatStoryForList($story, $options); - if($story->parent > 0) + $data[] = $this->story->formatStoryForList($story, $options, $storyType); + if(!isset($story->children)) continue; + + /* Children. */ + foreach($story->children as $key => $child) { - $story->parent = 0; - $story->isChild = true; + $child->moduleID = $child->module; + $data[] = $this->story->formatStoryForList($child, $options, $storyType); } - $data[] = $story; } jsVar('cases', $storyCases); diff --git a/module/story/model.php b/module/story/model.php index edfdb2a9dd..b8bb2bc3da 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -233,7 +233,7 @@ class storyModel extends model /* 格式化参数。 */ $orderBy = str_replace('branch_', 't2.branch_', $orderBy); $type = strtolower($type); - if(is_string($excludeStories))$excludeStories = explode(',', $excludeStories); + if(is_string($excludeStories)) $excludeStories = explode(',', $excludeStories); /* 获取需求。 */ if($type == 'bysearch') $stories = $this->storyTao->getExecutionStoriesBySearch($executionID, (int)$param, $productID, $orderBy, $storyType, $excludeStories, $pager);