diff --git a/module/story/lang/de.php b/module/story/lang/de.php index d5e3e08eb7..16c752a2f1 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; $lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; +$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered."; $lang->story->form = new stdclass(); $lang->story->form->area = 'Story Bereich'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 10e9e56319..d9ebecd239 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; $lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; +$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered."; $lang->story->form = new stdclass(); $lang->story->form->area = 'Scope'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 9f33cdc716..33fd6110bf 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; $lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; +$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s status is closed, and the operation has been filtered."; $lang->story->form = new stdclass(); $lang->story->form->area = 'Périmètre'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 8e5b9c9e70..5606abccc7 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -321,6 +321,7 @@ $lang->story->errorDuplicateStory = $lang->SRCommon . '%s不存在'; $lang->story->confirmRecallChange = "撤销变更后,需求内容会回退至变更前的版本,您确定要撤销吗?"; $lang->story->confirmRecallReview = "您确定要撤回评审吗?"; $lang->story->noStoryToTask = "只有激活的{$lang->SRCommon}才能转为任务!"; +$lang->story->ignoreClosedStory = "{$lang->SRCommon} %s 状态为已关闭,本次操作已被过滤。"; $lang->story->form = new stdclass(); $lang->story->form->area = "该{$lang->SRCommon}所属范围"; diff --git a/module/story/model.php b/module/story/model.php index d733cd0a2b..f3ec4081a3 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2512,9 +2512,15 @@ class storyModel extends model $storyIdList = $this->post->storyIdList; $assignedTo = $this->post->assignedTo; $oldStories = $this->getByList($storyIdList); + $ignoreStories = ''; foreach($storyIdList as $storyID) { $oldStory = $oldStories[$storyID]; + if($oldStory->status == 'closed') + { + $ignoreStories .= "#{$storyID},"; + continue; + } if($assignedTo == $oldStory->assignedTo) continue; $story = new stdclass(); @@ -2527,6 +2533,11 @@ class storyModel extends model $allChanges[$storyID] = common::createChanges($oldStory, $story); } + if($ignoreStories) + { + $ignoreStories = trim($ignoreStories, ','); + echo js::alert(sprintf($this->lang->story->ignoreClosedStory, $ignoreStories)); + } return $allChanges; }