Merge branch 'pailei2_zhouxin_50789' into 'pailei2'

Pailei2 zhouxin 50789

See merge request easycorp/zentaopms!2294

module/bug/control.php

@@ -1701,7 +1701,7 @@ class bug extends control
                 }
                 else
                 {
-                    return print(js::closeModal('parent.parent'));
+                    return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
                 }
             }
             if(defined('RUN_MODE') && RUN_MODE == 'api')

module/story/control.php

@@ -1378,7 +1378,7 @@ class story extends control
                 }
                 else
                 {
-                    return print(js::closeModal('parent.parent', 'this'));
+                    return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
                 }
             }
 

module/story/model.php

@@ -1542,8 +1542,11 @@ class storyModel extends model
             ->where('id')->eq($storyID)->exec();
 
         /* Update parent story status and stage. */
-        if($oldStory->parent > 0) $this->updateParentStatus($storyID, $oldStory->parent);
-        $this->setStage($oldStory->parent);
+        if($oldStory->parent > 0)
+        {
+            $this->updateParentStatus($storyID, $oldStory->parent);
+            $this->setStage($oldStory->parent);
+        }
         if(!dao::isError()) $this->loadModel('score')->create('story', 'close', $storyID);
         return common::createChanges($oldStory, $story);
     }

module/testtask/control.php

@@ -876,7 +876,7 @@ class testtask extends control
 
             $this->executeHooks($taskID);
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent.parent'));
             return $this->send(array('result' => 'success', 'message' => $this->lang->success, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
         }
 

module/testtask/js/common.js

@@ -11,6 +11,10 @@ $(document).ready(function()
                     parent.$.cookie('selfClose', 1);
                     setTimeout(function(){parent.$.closeModal(null, 'this')}, 1200);
                 }
+                else if(response.locate == 'parent.parent')
+                {
+                    setTimeout(function(){parent.location.reload();}, 1200);
+                }
                 else
                 {
                     setTimeout(function(){window.location.href = response.locate;}, 1200);