From a2648a6577d7a863a00c048829b32babda9366cc Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Fri, 4 Aug 2023 13:42:15 +0800
Subject: [PATCH] * Unset load in response if request type is modal.

---
 framework/base/control.class.php | 8 +++++++-
 module/productplan/control.php   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 1db4ea420b..ff5ec3b200 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -1146,7 +1146,13 @@ class baseControl
     {
         $data['result'] = 'success';
         if(empty($data['message'])) $data['message'] = $this->lang->saveSuccess;
-        if(!isset($data['closeModal']) && helper::isAjaxRequest('modal')) $data['closeModal'] = true;
+
+        if(!isset($data['closeModal']) && helper::isAjaxRequest('modal'))
+        {
+            $data['closeModal'] = true;
+            if(isset($data['load'])) unset($data['load']);
+        }
+
         return $this->send($data);
     }
 
diff --git a/module/productplan/control.php b/module/productplan/control.php
index c95a26473e..411d0d8b17 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -78,7 +78,7 @@ class productplan extends control
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $planID));
-            return $this->sendSuccess(array('load' => $this->createLink($this->app->rawModule, 'browse', "productID=$productID"), 'closeModal' => true));
+            return $this->sendSuccess(array('load' => $this->createLink($this->app->rawModule, 'browse', "productID=$productID")));
         }
 
         $this->commonAction($productID, $branchID);