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 1/2] 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 {

From e81ed5b66021a8c6b6fe0047079fc3d5c43325c9 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sat, 20 Apr 2019 16:57:13 +0800
Subject: [PATCH 2/2] Add theme folder name in theme property

---
 .../app/handler/theme/config/support/ThemeProperty.java    | 7 ++++++-
 .../java/run/halo/app/service/impl/ThemeServiceImpl.java   | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
index 6b6f4afa9..947fb139a 100644
--- a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
+++ b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
@@ -49,10 +49,15 @@ public class ThemeProperty {
     private Author author;
 
     /**
-     * Folder name.
+     * Theme path.
      */
     private String themePath;
 
+    /**
+     * Theme folder name.
+     */
+    private String folderName;
+
     /**
      * Has options.
      */
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 fddffeb1a..7bd8d9a2c 100644
--- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
@@ -282,10 +282,8 @@ public class ThemeServiceImpl implements ThemeService {
     public String render(String pageName) {
         // Get activated theme
         ThemeProperty activatedTheme = getActivatedTheme();
-        // Get theme folder name
-        String themeFolderName = Paths.get(activatedTheme.getThemePath()).getFileName().toString();
         // Build render url
-        return String.format(RENDER_TEMPLATE, themeFolderName, pageName);
+        return String.format(RENDER_TEMPLATE, activatedTheme.getFolderName(), pageName);
     }
 
     @Override
@@ -644,6 +642,7 @@ public class ThemeServiceImpl implements ThemeService {
 
             // Resolve additional properties
             themeProperty.setThemePath(themePath.toString());
+            themeProperty.setFolderName(themePath.getFileName().toString());
             themeProperty.setHasOptions(hasOptions(themePath));
             themeProperty.setActivated(false);