From 175739dbd417774319e61dfe97f1e2ac50e8e9da Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 20 Apr 2019 21:20:25 +0800
Subject: [PATCH] Fix theme activation bug

---
 .../halo/app/event/theme/FreemarkerConfigAwareListener.java    | 2 +-
 src/main/java/run/halo/app/service/ThemeService.java           | 2 +-
 src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java  | 3 ++-
 .../run/halo/app/web/controller/admin/api/ThemeController.java | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java b/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
index 5d5e20dff..ad8e6f4b4 100644
--- a/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
+++ b/src/main/java/run/halo/app/event/theme/FreemarkerConfigAwareListener.java
@@ -19,8 +19,8 @@ import java.util.Map;
  * @author johnniang
  * @date 19-4-20
  */
-@Component
 @Slf4j
+@Component
 public class FreemarkerConfigAwareListener {
 
     private final OptionService optionService;
diff --git a/src/main/java/run/halo/app/service/ThemeService.java b/src/main/java/run/halo/app/service/ThemeService.java
index 7cb3c365f..42d499b3d 100644
--- a/src/main/java/run/halo/app/service/ThemeService.java
+++ b/src/main/java/run/halo/app/service/ThemeService.java
@@ -210,7 +210,7 @@ public interface ThemeService {
      * @return theme property
      */
     @NonNull
-    ThemeProperty activeTheme(@NonNull String themeId);
+    ThemeProperty activateTheme(@NonNull String themeId);
 
     /**
      * Upload theme.
diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
index 562f08186..337b92dac 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -316,7 +316,7 @@ public class ThemeServiceImpl implements ThemeService {
     }
 
     @Override
-    public ThemeProperty activeTheme(String themeId) {
+    public ThemeProperty activateTheme(String themeId) {
         // Check existence of the theme
         ThemeProperty themeProperty = getThemeOfNonNullBy(themeId);
 
@@ -508,6 +508,7 @@ public class ThemeServiceImpl implements ThemeService {
      */
     private void setActivatedTheme(@Nullable ThemeProperty activatedTheme) {
         this.activatedTheme = activatedTheme;
+        this.activatedThemeId = activatedTheme.getId();
     }
 
     /**
diff --git a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java b/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
index c9ace40a7..41f6b4fb6 100644
--- a/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
+++ b/src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java
@@ -71,7 +71,7 @@ public class ThemeController {
     @PostMapping("{themeId}/activation")
     @ApiOperation("Activates a theme")
     public ThemeProperty active(@PathVariable("themeId") String themeId) {
-        return themeService.activeTheme(themeId);
+        return themeService.activateTheme(themeId);
     }
 
     @GetMapping("activation")