From a0e1e77cd6d2cc60cfb5e6f01dede3e6e027f7ed Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 28 Sep 2020 11:46:28 +0800
Subject: [PATCH] * Fix bug#3531.

---
 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-tw.php | 1 +
 module/story/model.php      | 2 +-
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 476e18cde9..1910456357 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -228,6 +228,7 @@ $lang->story->noStory               = 'Keine Storys. ';
 $lang->story->ignoreChangeStage     = 'Story %s is in Draft or Closed status. Please review it..';
 $lang->story->cannotDeleteParent    = "Can not delete parent {$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->changeBranchTips      = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
 
 $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 feb8d866d7..f7ddb4d9d9 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -228,6 +228,7 @@ $lang->story->noStory               = 'No stories yet. ';
 $lang->story->ignoreChangeStage     = 'Story %s is in Draft or Closed status. Please review it..';
 $lang->story->cannotDeleteParent    = "Can not delete parent {$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->changeBranchTips      = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
 
 $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 c0983e3fa1..109ce9d64a 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -228,6 +228,7 @@ $lang->story->noStory               = "Aucune story pour l'instant. ";
 $lang->story->ignoreChangeStage     = 'Story %s is in Draft or Closed status. Please review it..';
 $lang->story->cannotDeleteParent    = "Impossible de supprimer {$lang->storyCommon} parent";
 $lang->story->moveChildrenTips      = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->changeBranchTips      = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Périmètre';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index a3f3cd2435..9268674720 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -228,6 +228,7 @@ $lang->story->noStory              = 'Không có câu chuyện nào';
 $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Please review it..';
 $lang->story->cannotDeleteParent   = "Không thể xóa {$lang->storyCommon} mẹ";
 $lang->story->moveChildrenTips      = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}.";
+$lang->story->changeBranchTips      = "Its Child {$lang->storyCommon} will be moved to the selected branch when editing the linked branch of Parent {$lang->storyCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Phạm vi';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 26eeea5c62..129359811c 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -228,6 +228,7 @@ $lang->story->noStory               = "暫時沒有{$lang->storyCommon}。";
 $lang->story->ignoreChangeStage     = "{$lang->storyCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。";
 $lang->story->cannotDeleteParent    = "不能刪除父{$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。";
+$lang->story->changeBranchTips      = "修改父{$lang->storyCommon}的所屬分支會將其下的子{$lang->storyCommon}也移動到所選分支下。";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = "該{$lang->storyCommon}所屬範圍";
diff --git a/module/story/model.php b/module/story/model.php
index 336a5a8d03..cbae8e34af 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -567,7 +567,7 @@ class storyModel extends model
             ->remove('files,labels,comment,contactListMenu,stages')
             ->get();
         if(isset($story->plan) and is_array($story->plan)) $story->plan = trim(join(',', $story->plan), ',');
-        if(empty($_POST['product']) or !isset($_POST['branch'])) $story->branch = $oldStory->branch;
+        if(empty($_POST['product'])) $story->branch = $oldStory->branch;
         if(isset($_POST['branch']) and $_POST['branch'] == 0) $story->branch = 0;
         if(!empty($_POST['stages']))
         {