From 9c9dedafa956965f53d82bd3c9b37514769d679a Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 8 Jan 2021 00:01:19 +0900
Subject: [PATCH] Fix favorite removal not working in admin menu

---
 modules/admin/conf/module.xml            | 2 +-
 modules/admin/ruleset/toggleFavorite.xml | 8 --------
 modules/admin/tpl/_header.html           | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 modules/admin/ruleset/toggleFavorite.xml

diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index fab3c0ceb..8a28e7b8d 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -21,7 +21,7 @@
 		<action name="procAdminRecompileCacheFile" type="controller" />
 		<action name="procAdminLogout" type="controller" method="GET|POST" />
 		<action name="procAdminInsertDefaultDesignInfo" type="controller" />
-		<action name="procAdminToggleFavorite" type="controller" ruleset="toggleFavorite" />
+		<action name="procAdminToggleFavorite" type="controller" />
 		<action name="procAdminEnviromentGatheringAgreement" type="controller" />
 		<action name="procAdminUpdateConfig" type="controller" />
 		<action name="procAdminDeleteLogo" type="controller" />
diff --git a/modules/admin/ruleset/toggleFavorite.xml b/modules/admin/ruleset/toggleFavorite.xml
deleted file mode 100644
index b2a4e7f1e..000000000
--- a/modules/admin/ruleset/toggleFavorite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ruleset version="1.5.0">
-	<customrules />
-	<fields>
-		<field name="site_srl" required="true" rule="number" />
-		<field name="module_name" required="true" />		
-    </fields>
-</ruleset>
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index 0ce0af240..804138c42 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -68,9 +68,9 @@
 							<a cond="!$favorite->title">{$lang->msg_not_founded}</a>
 							<form class="remove" action="./" method="post">
 								<input type="hidden" name="module" value="admin" />
-								<input type="hidden" name="act" value="" />
+								<input type="hidden" name="act" value="procAdminToggleFavorite" />
 								<input type="hidden" name="module_name" value="{$favorite->module}" />
-								<input type="hidden" name="success_return_url" value="{getUrl(['module' => 'admin'])}" />
+								<input type="hidden" name="success_return_url" value="{getCurrentUrl()}" />
 								<button type="submit" class="x_close" title="{$lang->cmd_delete}">&times;</button>
 							</form>
 						</li>