diff --git a/module/story/lang/de.php b/module/story/lang/de.php index a2b8a63979..1842d8a6cd 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -102,7 +102,7 @@ $lang->story->planAB = 'Plan'; $lang->story->comment = 'Kommentar'; $lang->story->linkStories = 'Story verknüpfen'; $lang->story->childStories = 'Story aufteilen'; -$lang->story->duplicateStory = 'Story kopieren'; +$lang->story->duplicateStory = 'Story ID kopieren'; $lang->story->reviewResult = 'Ergbnis prüfen'; $lang->story->preVersion = 'Frühere Version'; $lang->story->keywords = 'Tags'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index f09a433a07..1fdf3d4af3 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -102,7 +102,7 @@ $lang->story->planAB = 'Plan'; $lang->story->comment = 'Comment'; $lang->story->linkStories = 'Linked Stories'; $lang->story->childStories = 'Decomposed Stories'; -$lang->story->duplicateStory = 'Duplicated Story'; +$lang->story->duplicateStory = 'Duplicated Story ID'; $lang->story->reviewResult = 'Review Result'; $lang->story->preVersion = 'Last Version'; $lang->story->keywords = 'Tags'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 063bcc5a4f..46aad0f326 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -102,7 +102,7 @@ $lang->story->planAB = 'Plan'; $lang->story->comment = 'Commentaire'; $lang->story->linkStories = 'Stories Liées'; $lang->story->childStories = 'Stories Décomposées'; -$lang->story->duplicateStory = 'Story Dupliquées'; +$lang->story->duplicateStory = 'Story ID Dupliquées'; $lang->story->reviewResult = 'Résultat Validation'; $lang->story->preVersion = 'Dernière Version'; $lang->story->keywords = 'Tags'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index eb711fffeb..9a213896a2 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -102,7 +102,7 @@ $lang->story->planAB = '计划'; $lang->story->comment = '备注'; $lang->story->linkStories = "相关{$lang->storyCommon}"; $lang->story->childStories = "细分{$lang->storyCommon}"; -$lang->story->duplicateStory = "重复{$lang->storyCommon}"; +$lang->story->duplicateStory = "重复{$lang->storyCommon}ID"; $lang->story->reviewResult = '评审结果'; $lang->story->preVersion = '之前版本'; $lang->story->keywords = '关键词'; diff --git a/module/story/model.php b/module/story/model.php index 9b93274cde..4cf085a8a3 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -850,12 +850,6 @@ class storyModel extends model */ public function close($storyID) { - if(strpos($this->config->story->close->requiredFields, 'comment') !== false and !$this->post->comment) - { - dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->comment); - return false; - } - $oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch(); $now = helper::now(); $story = fixer::input('post') @@ -869,13 +863,13 @@ class storyModel extends model ->setDefault('assignedDate', $now) ->removeIF($this->post->closedReason != 'duplicate', 'duplicateStory') ->removeIF($this->post->closedReason != 'subdivided', 'childStories') - ->remove('comment') ->get(); - $this->dao->update(TABLE_STORY)->data($story) + $this->lang->story->comment = $this->lang->comment; + $this->dao->update(TABLE_STORY)->data($story, 'comment') ->autoCheck() ->batchCheck($this->config->story->close->requiredFields, 'notempty') - ->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty') + ->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty') ->where('id')->eq($storyID)->exec(); if(!dao::isError()) $this->loadModel('score')->create('story', 'close', $storyID); return common::createChanges($oldStory, $story); diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 31a27df0f9..020f152766 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -30,7 +30,7 @@ story->duplicateStory;?> - + story->childStories;?>