diff --git a/module/story/lang/de.php b/module/story/lang/de.php index c558e80078..78ed708a0f 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -432,11 +432,10 @@ $lang->story->recallTip = array(); $lang->story->recallTip['actived'] = 'The Story has not initiated a review process and no undo action is required.'; $lang->story->recallTip['recalled'] = 'This Story has been withdrawn from review and cannot be cancelled.'; $lang->story->recallTip['reviewed'] = 'The review process has been started and cannot be cancelled.'; -$lang->story->recallTip['notOpenedBy'] = 'You are not the review initiator and cannot cancel the operation.'; +$lang->story->recallTip['notOpenedBy'] = 'You are not the Story creator and cannot cancel the operation.'; $lang->story->subDivideTip = array(); $lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.'; $lang->story->subDivideTip['planned'] = 'The Story has been planned and cannot be subdivided.'; $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.'; -$lang->story->subDivideTip['reviewed'] = 'The review process has been started and cannot be subdivided.'; $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 803c8b835f..0261736f59 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -432,11 +432,10 @@ $lang->story->recallTip = array(); $lang->story->recallTip['actived'] = 'The Story has not initiated a review process and no undo action is required.'; $lang->story->recallTip['recalled'] = 'This Story has been withdrawn from review and cannot be cancelled.'; $lang->story->recallTip['reviewed'] = 'The review process has been started and cannot be cancelled.'; -$lang->story->recallTip['notOpenedBy'] = 'You are not the review initiator and cannot cancel the operation.'; +$lang->story->recallTip['notOpenedBy'] = 'You are not the Story creator and cannot cancel the operation.'; $lang->story->subDivideTip = array(); $lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.'; $lang->story->subDivideTip['planned'] = 'The Story has been planned and cannot be subdivided.'; $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.'; -$lang->story->subDivideTip['reviewed'] = 'The review process has been started and cannot be subdivided.'; $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index a360ae3682..47ef083382 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -438,5 +438,4 @@ $lang->story->subDivideTip = array(); $lang->story->subDivideTip['subStory'] = 'Les sous-stories ne peuvent pas être décomposées.'; $lang->story->subDivideTip['planned'] = 'Cette Story est planifiée et ne peut être subdivisée.'; $lang->story->subDivideTip['projected'] = 'Cette Story a été créée et ne peut être subdivisée.'; -$lang->story->subDivideTip['reviewed'] = 'Il est entré dans le processus de révision et ne peut être subdivisé.'; $lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne peut être subdivisée."; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index 360f5d83ca..fcd4ee08ac 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -432,11 +432,10 @@ $lang->story->recallTip = array(); $lang->story->recallTip['actived'] = 'The Story has not initiated a review process and no undo action is required.'; $lang->story->recallTip['recalled'] = 'This Story has been withdrawn from review and cannot be cancelled.'; $lang->story->recallTip['reviewed'] = 'The review process has been started and cannot be cancelled.'; -$lang->story->recallTip['notOpenedBy'] = 'You are not the review initiator and cannot cancel the operation.'; +$lang->story->recallTip['notOpenedBy'] = 'You are not the Story creator and cannot cancel the operation.'; $lang->story->subDivideTip = array(); $lang->story->subDivideTip['subStory'] = 'The Sub-stories cannot be subdivided.'; $lang->story->subDivideTip['planned'] = 'The Story has been planned and cannot be subdivided.'; $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.'; -$lang->story->subDivideTip['reviewed'] = 'The review process has been started and cannot be subdivided.'; $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index fc929d2d1e..8ff0125435 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -432,11 +432,10 @@ $lang->story->recallTip = array(); $lang->story->recallTip['actived'] = '该需求未发起评审流程,无需撤销操作'; $lang->story->recallTip['recalled'] = '该需求已经撤销评审,无法进行撤销操作'; $lang->story->recallTip['reviewed'] = '已进入评审流程,无法进行撤销操作'; -$lang->story->recallTip['notOpenedBy'] = '您不是评审发起人,无法进行撤销操作'; +$lang->story->recallTip['notOpenedBy'] = '您不是需求创建者,无法进行撤销操作'; $lang->story->subDivideTip = array(); $lang->story->subDivideTip['subStory'] = '子需求无法细分'; $lang->story->subDivideTip['planned'] = '该需求已计划,无法进行细分操作'; $lang->story->subDivideTip['projected'] = '该需求已立项,无法进行细分操作'; -$lang->story->subDivideTip['reviewed'] = '已进入评审流程,无法进行细分操作'; $lang->story->subDivideTip['notActive'] = '需求不是激活状态,无法进行细分操作'; diff --git a/module/story/model.php b/module/story/model.php index 49a44b3057..5386673903 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3884,6 +3884,7 @@ class storyModel extends model if($story->status == 'active' and empty($story->reviewer)) $title = $this->lang->story->recallTip['actived']; } $menu .= $this->buildMenu('story', 'recall', $params, $story, $type, 'undo', 'hiddenwin', '', '', '', $title); + $menu .= $this->buildMenu('story', 'close', $params, $story, $type, '', '', 'iframe', true); $menu .= $this->buildMenu('story', 'edit', $params . "&from=$story->from", $story, $type); if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$params", $story, $type, 'sitemap', '', '', false, "data-app='qa'"); @@ -3900,10 +3901,9 @@ class storyModel extends model } else { + if($story->status != 'active') $title = $this->lang->story->subDivideTip['notActive']; if(!empty($story->plan)) $title = $this->lang->story->subDivideTip['planned']; if($story->stage == 'projected') $title = $this->lang->story->subDivideTip['projected']; - if($story->status == 'draft' and !empty($story->reviewer)) $title = $this->lang->story->subDivideTip['reviewed']; - if($story->status != 'active') $title = $this->lang->story->subDivideTip['notActive']; } } $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}", $story, $type, 'split', '', '', '', '', $title);