diff --git a/module/execution/model.php b/module/execution/model.php index cd935467a3..b4e6f3e89f 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3110,12 +3110,12 @@ class executionModel extends model } elseif((helper::today() >= $execution->begin) and (helper::today() <= $execution->end)) { - $begin = (date('Y-m-d', strtotime('-14 days')) < $execution->begin) ? $execution->begin : date('Y-m-d', strtotime('-14 days')); + $begin = (date('Y-m-d', strtotime('-13 days')) < $execution->begin) ? $execution->begin : date('Y-m-d', strtotime('-13 days')); $end = helper::today(); } elseif((helper::today() > $execution->end)) { - $begin = date($execution->end, strtotime('-14 days')) > $execution->begin ? date($execution->end, strtotime('-14 days')) : $execution->begin; + $begin = date($execution->end, strtotime('-13 days')) > $execution->begin ? date($execution->end, strtotime('-13 days')) : $execution->begin; $end = $execution->end; } 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]} "; diff --git a/module/testcase/css/batchcreate.css b/module/testcase/css/batchcreate.css index 8b4d0feed1..993b9e8647 100644 --- a/module/testcase/css/batchcreate.css +++ b/module/testcase/css/batchcreate.css @@ -15,3 +15,4 @@ .c-precondition {width: 150px;} .c-story {width: 180px;} .c-review{width: 105px;} +.c-actions {width: 60px;} diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js index 334a133631..055bf93804 100644 --- a/module/testcase/js/batchcreate.js +++ b/module/testcase/js/batchcreate.js @@ -67,3 +67,35 @@ $(document).ready(function() return false; }); }); + +/** + * Add item. + * + * @param object $obj + * @access public + * @return void + */ +function addItem(obj) +{ + var item = $('#addItem').html().replace(/%i%/g, itemIndex + 1); + $('