From a2b9cf084c7145a5560d5b5cd880ed2510c1f03e Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 30 Sep 2020 14:21:26 +0800
Subject: [PATCH] * Finish task#8081.

---
 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 -
 module/story/lang/zh-tw.php       |  1 -
 module/story/model.php            |  5 -----
 module/story/view/edit.html.php   |  2 --
 module/story/view/header.html.php | 11 -----------
 9 files changed, 24 deletions(-)

diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 1910456357..476e18cde9 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -228,7 +228,6 @@ $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 f7ddb4d9d9..feb8d866d7 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -228,7 +228,6 @@ $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 109ce9d64a..c0983e3fa1 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -228,7 +228,6 @@ $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 9268674720..a3f3cd2435 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -228,7 +228,6 @@ $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-cn.php b/module/story/lang/zh-cn.php
index 291e3ebce9..3cb5bd631b 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -228,7 +228,6 @@ $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/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 129359811c..26eeea5c62 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -228,7 +228,6 @@ $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 722ea80eda..44628da8db 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -620,11 +620,6 @@ class storyModel extends model
                 }
             }
 
-            if($oldStory->parent == '-1' and $story->branch != $oldStory->branch)
-            {
-                $this->dao->update(TABLE_STORY)->set('branch')->eq($story->branch)->where('parent')->eq($storyID)->exec();
-            }
-
             $this->loadModel('action');
             $changed = $story->parent != $oldStory->parent;
             if($oldStory->parent > 0)
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 02f0ace7fb..df9c81d698 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -12,10 +12,8 @@
 ?>
 <?php include './header.html.php';?>
 <?php js::set('oldProductID', $story->product);?>
-<?php js::set('oldBranch', $story->branch);?>
 <?php js::set('parentStory', !empty($story->children));?>
 <?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
-<?php js::set('changeBranchTips', $lang->story->changeBranchTips);?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index b7217dbee1..cb917062dd 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -34,17 +34,6 @@ function loadProduct(productID)
 
 function loadBranch()
 {
-    if(typeof parentStory != 'undefined' && parentStory)
-    {
-        confirmLoadBranch = confirm(changeBranchTips);
-        if(!confirmLoadBranch)
-        {
-            $('#branch').val(oldBranch);
-            $('#branch').trigger("chosen:updated");
-            return false;
-        }
-    }
-
     var branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
     loadProductModules($('#product').val(), branch);