From d664bc44b02fec862df1ace91e1fd08913dc6fd2 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Wed, 6 Jul 2022 15:39:33 +0800 Subject: [PATCH] * fix bug #24785 --- module/story/model.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index e514fcb1da..175726a30b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3927,7 +3927,7 @@ class storyModel extends model if($story->stage == 'projected') $title = $this->lang->story->subDivideTip['projected']; } } - $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}", $story, $type, 'split', '', 'showinonlybody', '', '', $title); + $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}&plan={$story->plan}&type={$story->type}", $story, $type, 'split', '', 'showinonlybody', '', '', $title); } if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin', 'showinonlybody'); @@ -4089,7 +4089,11 @@ class storyModel extends model foreach($stories as $story) { - if(!isset($group[$story->id])) continue; + if(!isset($group[$story->id])) + { + unset($stories[$story->id]); + continue; + } $story->children = $this->getByList($group[$story->id]); } } @@ -4373,7 +4377,7 @@ class storyModel extends model { $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1; } - if($storyType == 'requirement') echo 'SR '; + if($storyType == 'requirement') echo '' .$this->lang->story->childrenAB. ' '; if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}"; if(isset($branches[$story->branch]) and $showBranch and $this->config->vision == 'rnd') echo "branch]}>{$branches[$story->branch]} "; if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} ";