From e80da381ba628b58214c2ec89570dc411e5566e2 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 1 Nov 2022 08:06:45 +0000
Subject: [PATCH] * Finish task#74154,#74153.

---
 module/story/lang/de.php    | 4 +++-
 module/story/lang/en.php    | 4 +++-
 module/story/lang/fr.php    | 4 +++-
 module/story/lang/vi.php    | 4 +++-
 module/story/lang/zh-cn.php | 4 +++-
 module/story/model.php      | 9 +++++++--
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 024115e026..213717843b 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -475,7 +475,9 @@ $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draf
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
 $lang->story->operateList = array();
-$lang->story->operateList['assigned'] = 'assigned';
+$lang->story->operateList['assigned']  = 'assigned';
+$lang->story->operateList['closed']    = 'closed';
+$lang->story->operateList['activated'] = 'activated';
 
 $lang->requirement->common             = $lang->URCommon;
 $lang->requirement->create             = 'Create Requirement';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 4c28eaf21f..160af1a2d8 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -475,7 +475,9 @@ $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draf
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
 $lang->story->operateList = array();
-$lang->story->operateList['assigned'] = 'assigned';
+$lang->story->operateList['assigned']  = 'assigned';
+$lang->story->operateList['closed']    = 'closed';
+$lang->story->operateList['activated'] = 'activated';
 
 $lang->requirement->common             = $lang->URCommon;
 $lang->requirement->create             = 'Create Requirement';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 2a9d47de15..5d1147ccdb 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -475,7 +475,9 @@ $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draf
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
 $lang->story->operateList = array();
-$lang->story->operateList['assigned'] = 'assigned';
+$lang->story->operateList['assigned']  = 'assigned';
+$lang->story->operateList['closed']    = 'closed';
+$lang->story->operateList['activated'] = 'activated';
 
 $lang->requirement->common             = $lang->URCommon;
 $lang->requirement->create             = 'Create Requirement';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index c90ce0e542..c2ee4c228c 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -463,4 +463,6 @@ $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draf
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
 $lang->story->operateList = array();
-$lang->story->operateList['assigned'] = 'assigned';
+$lang->story->operateList['assigned']  = 'assigned';
+$lang->story->operateList['closed']    = 'closed';
+$lang->story->operateList['activated'] = 'activated';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index dcf38a08b4..786aa015be 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -475,7 +475,9 @@ $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draf
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
 $lang->story->operateList = array();
-$lang->story->operateList['assigned'] = '指派';
+$lang->story->operateList['assigned']  = '指派';
+$lang->story->operateList['closed']    = '关闭';
+$lang->story->operateList['activated'] = '激活';
 
 $lang->requirement->common             = $lang->URCommon;
 $lang->requirement->create             = "提{$lang->URCommon}";
diff --git a/module/story/model.php b/module/story/model.php
index d2b8b88c92..fee6c25881 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1794,7 +1794,10 @@ class storyModel extends model
 
             if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldStory->feedback) $this->loadModel('feedback')->updateStatus('story', $oldStory->feedback, $story->status, $oldStory->status);
         }
-        return common::createChanges($oldStory, $story);
+
+        $changes = common::createChanges($oldStory, $story);
+        if(!empty($oldStory->siblings)) $this->syncSiblings($storyID, $oldStory->siblings, $changes, 'Closed');
+        return $changes;
     }
 
     /**
@@ -2388,7 +2391,9 @@ class storyModel extends model
         /* Update parent story status. */
         if($oldStory->parent > 0) $this->updateParentStatus($storyID, $oldStory->parent);
 
-        return common::createChanges($oldStory, $story);
+        $changes = common::createChanges($oldStory, $story);
+        if(!empty($oldStory->siblings)) $this->syncSiblings($storyID, $oldStory->siblings, $changes, 'Activated');
+        return $changes;
     }
 
     /**