From 6972e19d53fa6c835880b1fedd2d3d806e346f21 Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Sat, 25 Jul 2020 22:13:30 +0800
Subject: [PATCH 1/4]  * Finish task #7522.

---
 lib/base/front/front.class.php | 45 ++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index b5c2a680f6..64b2e7db32 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -802,7 +802,14 @@ class baseJS
     {
         global $app;
 
-        if($app->viewType == 'json') return json_encode(array('message' => $message));
+        if($app->viewType == 'json')
+        {
+            $output = array();
+            $output['data'] = json_encode(array('message' => $message));
+            $output['md5']  = md5(json_encode(array('message' => $message)));
+
+            return json_encode($output);
+        }
 
         return self::start($full) . "alert('" . $message . "')" . self::end() . self::resetForm();
     }
@@ -834,7 +841,15 @@ class baseJS
     {
         global $app;
 
-        if($app->viewType == 'json') return json_encode(array('message' => $message));
+        if($app->viewType == 'json')
+        {
+            $output = array();
+            $output['status'] = 'fail';
+            $output['data']   = json_encode(array('message' => $message));
+            $output['md5']    = md5(json_encode(array('message' => $message)));
+
+            return json_encode($output);
+        }
 
         $alertMessage = '';
         if(is_array($message))
@@ -882,11 +897,16 @@ class baseJS
         global $app;
         if($app->viewType == 'json')
         {
-            $output['message']      = $message;
-            $output['okURL']        = common::getSysURL() . $okURL;
-            $output['cancleURL']    = common::getSysURL() . $cancleURL;
-            $output['okTarget']     = $okTarget;
-            $output['cancleTarget'] = $cancleTarget;
+            $data = array();
+            $data['message']      = $message;
+            $data['okURL']        = common::getSysURL() . $okURL;
+            $data['cancleURL']    = common::getSysURL() . $cancleURL;
+            $data['okTarget']     = $okTarget;
+            $data['cancleTarget'] = $cancleTarget;
+
+            $output = array();
+            $output['data'] = json_encode($data);
+            $output['md5']  = md5(json_encode($data));
 
             return json_encode($output);
         }
@@ -948,7 +968,16 @@ EOT;
             $url = $config->webRoot;
         }
 
-        if($app->viewType == 'json') return json_encode(array('locate' => common::getSysURL() . $url));
+        if($app->viewType == 'json')
+        {
+            $data = strtolower($url) == 'back' ? array('locate' => 'back') : array('locate' => common::getSysURL() . $url);
+
+            $output = array();
+            $output['data'] = json_encode($data);
+            $output['md5']  = md5(json_encode($data));
+
+            return json_encode($output);
+        }
 
         $js  = self::start();
         if(strtolower($url) == "back")

From 2e568d4001995578ef0dd4f38521372d499185ac Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Sat, 25 Jul 2020 22:14:11 +0800
Subject: [PATCH 2/4]  * Finish task #7545.

---
 module/project/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 0dac802c00..3123842427 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -436,6 +436,8 @@ class projectModel extends model
      */
     public function batchUpdate()
     {
+        $this->loadModel('user');
+
         $projects    = array();
         $allChanges  = array();
         $data        = fixer::input('post')->get();
@@ -460,7 +462,6 @@ class projectModel extends model
             $projects[$projectID]->order  = $data->orders[$projectID];
         }
 
-        $this->loadModel('user');
         foreach($projects as $projectID => $project)
         {
             $oldProject = $oldProjects[$projectID];

From fe91f8c9d666f986690face99575f685bbef89fc Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Sat, 25 Jul 2020 22:16:40 +0800
Subject: [PATCH 3/4]  * Finish task #7556.

---
 module/testtask/view/groupcase.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index b32f5c06e2..1542cddbae 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -15,7 +15,7 @@
 <?php include './caseheader.html.php';?>
 <?php js::set('browseType', $browseType);?>
 <?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
-<div class="main-table" data-ride="table" data-checkable="false" data-group="true" data-replace-id="treetable">
+<div id='casesForm' class="main-table" data-ride="table" data-checkable="false" data-group="true" data-replace-id="treetable">
   <table class='table table-grouped text-center' id='treetable'>
     <thead>
       <tr class="divider">

From 29999a3689709f024a5f724f74e605965dd8a636 Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Sat, 25 Jul 2020 22:30:50 +0800
Subject: [PATCH 4/4]  * Finish task #7550.

---
 module/story/view/edit.html.php   |  1 +
 module/story/view/header.html.php | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index a4b408d994..df9c81d698 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php js::set('oldProductID', $story->product);?>
 <?php js::set('parentStory', !empty($story->children));?>
 <?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
 <div class='main-content' id='mainContent'>
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index 0f6f77301c..b96b68712f 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -3,8 +3,29 @@
 <script>
 function loadProduct(productID)
 {
-    if(parentStory) alert(moveChildrenTips);
-    if(typeof hasSR != 'undefined' && hasSR) alert(moveSRTips);//Set hasSR variable in pro and biz.
+    if(parentStory)
+    {
+        confirmLoadProduct = confirm(moveChildrenTips);
+        if(!confirmLoadProduct)
+        {
+            $('#product').val(oldProductID);
+            $('#product').trigger("chosen:updated");
+            return false;
+        }
+    }
+
+    if(typeof hasSR != 'undefined' && hasSR)
+    {
+        confirmLoadProduct = confirm(moveSRTips);//Set hasSR variable in pro and biz.
+        if(!confirmLoadProduct)
+        {
+            $('#product').val(oldProductID);
+            $('#product').trigger("chosen:updated");
+            return false;
+        }
+    }
+
+    oldProductID = $('#product').val();
 
     loadProductBranches(productID)
     loadProductModules(productID);