From e46c1f87406ac5bef074e13448f8c124ee1df405 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 20 Apr 2019 16:31:47 +0800
Subject: [PATCH] Replace themeName with themeId

---
 src/main/java/run/halo/app/listener/StartedListener.java        | 2 +-
 src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java   | 2 +-
 .../resources/templates/common/macro/theme_option_marco.ftl     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index cc61714e3..f4fa5c035 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -97,7 +97,7 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
      */
     private void cacheActiveTheme() {
         try {
-            configuration.setSharedVariable("themeName", themeService.getActivatedThemeId());
+            configuration.setSharedVariable("themeId", themeService.getActivatedThemeId());
         } catch (TemplateModelException e) {
             log.error("", e);
         }
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 4a4a7f882..fddffeb1a 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -331,7 +331,7 @@ public class ThemeServiceImpl implements ThemeService {
 
         try {
             // TODO Refactor here in the future
-            configuration.setSharedVariable("themeName", themeId);
+            configuration.setSharedVariable("themeId", themeId);
             configuration.setSharedVariable("options", optionService.listOptions());
         } catch (TemplateModelException e) {
             throw new ServiceException("Failed to set shared variable", e).setErrorData(themeId);
diff --git a/src/main/resources/templates/common/macro/theme_option_marco.ftl b/src/main/resources/templates/common/macro/theme_option_marco.ftl
index 0b4645389..99cc0eb45 100644
--- a/src/main/resources/templates/common/macro/theme_option_marco.ftl
+++ b/src/main/resources/templates/common/macro/theme_option_marco.ftl
@@ -69,7 +69,7 @@
      */
     function updateTheme(theme, e) {
         $(e).button('loading');
-        $.get('/admin/themes/pull',{'themeName': theme},function (data) {
+        $.get('/admin/themes/pull',{'themeId': theme},function (data) {
             if (data.code === 1) {
                 halo.showMsgAndParentRedirect(data.msg, 'success', 1000, '/admin/themes');
             } else {