From 80124c681e3f17834c2c83e08e94d4b1ddf11a65 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 12 May 2022 13:29:39 +0800
Subject: [PATCH 1/2] * Fix bug #22364.

---
 module/action/control.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 1057f4fc8a..52216bf597 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -104,8 +104,15 @@ class action extends control
      */
     public function undelete($actionID)
     {
+        $oldAction = $this->action->getById($actionID);
+        $extra     = $oldAction->extra == ACTIONMODEL::BE_HIDDEN ? 'hidden' : 'all';
+
         $this->action->undelete($actionID);
-        echo js::reload('parent');
+
+        $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, $extra, 'id_desc', null);
+        $browseType      = $sameTypeObjects ? $oldAction->objectType : 'all';
+
+        return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType&type=$extra"), 'parent'));
     }
 
     /**
@@ -117,8 +124,15 @@ class action extends control
      */
     public function hideOne($actionID)
     {
+        $oldAction = $this->action->getById($actionID);
+        $extra     = $oldAction->extra == ACTIONMODEL::BE_HIDDEN ? 'hidden' : 'all';
+
         $this->action->hideOne($actionID);
-        echo js::reload('parent');
+
+        $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, $extra, 'id_desc', null);
+        $browseType      = $sameTypeObjects ? $oldAction->objectType : 'all';
+
+        return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType&type=$extra"), 'parent'));
     }
 
     /**

From d99acc8cf8f1d65f94f047d93ada2c12da583df9 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 12 May 2022 13:37:11 +0800
Subject: [PATCH 2/2] * Remove the unused code.

---
 module/action/control.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 52216bf597..604a4a8e8d 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -125,14 +125,13 @@ class action extends control
     public function hideOne($actionID)
     {
         $oldAction = $this->action->getById($actionID);
-        $extra     = $oldAction->extra == ACTIONMODEL::BE_HIDDEN ? 'hidden' : 'all';
 
         $this->action->hideOne($actionID);
 
-        $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, $extra, 'id_desc', null);
+        $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, 'all', 'id_desc', null);
         $browseType      = $sameTypeObjects ? $oldAction->objectType : 'all';
 
-        return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType&type=$extra"), 'parent'));
+        return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType"), 'parent'));
     }
 
     /**