diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java index 5869334c..a925b986 100644 --- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java +++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java @@ -16,11 +16,13 @@ public class GlobalControllerAdvice { private final SettingService settingService; private final com.sisvietnamvn.web.service.MenuService menuService; + private final com.sisvietnamvn.web.hook.HookManager hookManager; private final PathMatchingResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - public GlobalControllerAdvice(SettingService settingService, com.sisvietnamvn.web.service.MenuService menuService) { + public GlobalControllerAdvice(SettingService settingService, com.sisvietnamvn.web.service.MenuService menuService, com.sisvietnamvn.web.hook.HookManager hookManager) { this.settingService = settingService; this.menuService = menuService; + this.hookManager = hookManager; } /** @@ -64,6 +66,11 @@ public class GlobalControllerAdvice { return getWidgets("footer"); } + @ModelAttribute("hookManager") + public com.sisvietnamvn.web.hook.HookManager getHookManager() { + return hookManager; + } + @ModelAttribute("themeModPrimaryColor") public String getThemeModPrimaryColor() { return settingService.getValue("theme_mod_primaryColor", "#007bff"); diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/hook/HookManager.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/hook/HookManager.java index 6aff136b..0b14b525 100644 --- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/hook/HookManager.java +++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/hook/HookManager.java @@ -50,13 +50,18 @@ public class HookManager { /** * Executes an action and returns an empty string. * This is useful for invoking actions directly within Thymeleaf templates - * (e.g., ). + * (e.g., ). */ public String doActionAndReturn(String hookName, Object... args) { doAction(hookName, args); return ""; } + public String doActionAndReturn(String hookName) { + doAction(hookName); + return ""; + } + // --- Filters --- public void addFilter(String hookName, FilterCallback callback, int priority) { diff --git a/sisvietnamvn_main/src/main/resources/templates/fragments/manage-layout.html b/sisvietnamvn_main/src/main/resources/templates/fragments/manage-layout.html index 7a14277c..8a651191 100644 --- a/sisvietnamvn_main/src/main/resources/templates/fragments/manage-layout.html +++ b/sisvietnamvn_main/src/main/resources/templates/fragments/manage-layout.html @@ -20,7 +20,7 @@ - + @@ -361,7 +361,7 @@
- + diff --git a/sisvietnamvn_main/src/main/resources/templates/themes/default/layout.html b/sisvietnamvn_main/src/main/resources/templates/themes/default/layout.html index c1708a51..f53cc650 100644 --- a/sisvietnamvn_main/src/main/resources/templates/themes/default/layout.html +++ b/sisvietnamvn_main/src/main/resources/templates/themes/default/layout.html @@ -7,7 +7,7 @@ - + @@ -32,6 +32,6 @@
- + diff --git a/sisvietnamvn_main/src/main/resources/templates/themes/modern/layout.html b/sisvietnamvn_main/src/main/resources/templates/themes/modern/layout.html index 5ecc0bd9..aebb8c58 100644 --- a/sisvietnamvn_main/src/main/resources/templates/themes/modern/layout.html +++ b/sisvietnamvn_main/src/main/resources/templates/themes/modern/layout.html @@ -7,7 +7,7 @@ - + @@ -33,6 +33,6 @@
- +