From 0ddb613cdcafd66da4049a3e294088e89f4f5ecd Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 8 Nov 2022 03:03:21 +0000 Subject: [PATCH] * Finish task#75323. --- module/story/control.php | 10 ++++++++++ module/story/lang/de.php | 1 + module/story/lang/en.php | 1 + module/story/lang/fr.php | 1 + module/story/lang/vi.php | 1 + module/story/lang/zh-cn.php | 1 + 6 files changed, 15 insertions(+) diff --git a/module/story/control.php b/module/story/control.php index 95eef188c1..0997ea8699 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -941,6 +941,16 @@ class story extends control /* Get edited stories. */ $stories = $this->story->getByList($storyIdList); + /* Filter siblings. */ + $siblings = ''; + foreach($stories as $id => $story) + { + if(empty($story->siblings)) continue; + $siblings .= "#$id "; + unset($stories[$id]); + } + if(!empty($siblings)) echo js::alert(sprintf($this->lang->story->batchEditTip, $siblings)); + $this->loadModel('branch'); if($productID and !$executionID) { diff --git a/module/story/lang/de.php b/module/story/lang/de.php index c478d0ca16..314bf9b5c6 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -107,6 +107,7 @@ $lang->story->assignSyncTip = "Both twin stories modify the assignor synch $lang->story->closeSyncTip = "Twin stories are closed synchronously"; $lang->story->activateSyncTip = "Twin stories are activated synchronously"; $lang->story->relievedSiblingsTip = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?"; +$lang->story->batchEditTip = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered."; $lang->story->id = 'ID'; $lang->story->parent = 'Parent'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 473641ca74..825b756667 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -107,6 +107,7 @@ $lang->story->assignSyncTip = "Both twin stories modify the assignor synch $lang->story->closeSyncTip = "Twin stories are closed synchronously"; $lang->story->activateSyncTip = "Twin stories are activated synchronously"; $lang->story->relievedSiblingsTip = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?"; +$lang->story->batchEditTip = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered."; $lang->story->id = 'ID'; $lang->story->parent = 'Parent'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index c58ed91327..1635f98d77 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -107,6 +107,7 @@ $lang->story->assignSyncTip = "Both twin stories modify the assignor synch $lang->story->closeSyncTip = "Twin stories are closed synchronously"; $lang->story->activateSyncTip = "Twin stories are activated synchronously"; $lang->story->relievedSiblingsTip = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?"; +$lang->story->batchEditTip = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered."; $lang->story->id = 'ID'; $lang->story->parent = 'Parent'; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index 74c12c16ba..0d1534b1be 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -100,6 +100,7 @@ $lang->story->assignSyncTip = "Both twin stories modify the assignor synch $lang->story->closeSyncTip = "Twin stories are closed synchronously"; $lang->story->activateSyncTip = "Twin stories are activated synchronously"; $lang->story->relievedSiblingsTip = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?"; +$lang->story->batchEditTip = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered."; $lang->story->id = 'ID'; $lang->story->parent = 'Mẹ'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index cd1629296e..4f2d5117e1 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -107,6 +107,7 @@ $lang->story->assignSyncTip = "孪生需求均同步修改指派人"; $lang->story->closeSyncTip = "孪生需求均同步关闭"; $lang->story->activateSyncTip = "孪生需求均同步激活"; $lang->story->relievedSiblingsTip = '产品调整后,本需求自动解除孪生关系,需求不再同步,是否保存?'; +$lang->story->batchEditTip = "{$lang->SRCommon} %s为孪生需求,本次操作已被过滤。"; $lang->story->id = '编号'; $lang->story->parent = '父需求';