github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v1' into v1

pull/146/head
ruibaby 2019-04-20 17:03:53 +08:00
parent 297bde97d2 e81ed5b660
commit bd7d627d76
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
View File

@ -49,10 +49,15 @@ public class ThemeProperty {
private Author author; private Author author;
/** /**
* Folder name. * Theme path.
*/ */
private String themePath; private String themePath;
/**
* Theme folder name.
*/
private String folderName;
/** /**
* Has options. * Has options.
*/ */

2
src/main/java/run/halo/app/listener/StartedListener.java
View File

@ -97,7 +97,7 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
*/ */
private void cacheActiveTheme() { private void cacheActiveTheme() {
try { try {
configuration.setSharedVariable("themeName", themeService.getActivatedThemeId()); configuration.setSharedVariable("themeId", themeService.getActivatedThemeId());
} catch (TemplateModelException e) { } catch (TemplateModelException e) {
log.error("", e); log.error("", e);
} }

7
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

@ -282,10 +282,8 @@ public class ThemeServiceImpl implements ThemeService {
public String render(String pageName) { public String render(String pageName) {
// Get activated theme // Get activated theme
ThemeProperty activatedTheme = getActivatedTheme(); ThemeProperty activatedTheme = getActivatedTheme();
// Get theme folder name
String themeFolderName = Paths.get(activatedTheme.getThemePath()).getFileName().toString();
// Build render url // Build render url
return String.format(RENDER_TEMPLATE, themeFolderName, pageName); return String.format(RENDER_TEMPLATE, activatedTheme.getFolderName(), pageName);
} }
@Override @Override
@ -331,7 +329,7 @@ public class ThemeServiceImpl implements ThemeService {
try { try {
// TODO Refactor here in the future // TODO Refactor here in the future
configuration.setSharedVariable("themeName", themeId); configuration.setSharedVariable("themeId", themeId);
configuration.setSharedVariable("options", optionService.listOptions()); configuration.setSharedVariable("options", optionService.listOptions());
} catch (TemplateModelException e) { } catch (TemplateModelException e) {
throw new ServiceException("Failed to set shared variable", e).setErrorData(themeId); throw new ServiceException("Failed to set shared variable", e).setErrorData(themeId);
@ -644,6 +642,7 @@ public class ThemeServiceImpl implements ThemeService {
// Resolve additional properties // Resolve additional properties
themeProperty.setThemePath(themePath.toString()); themeProperty.setThemePath(themePath.toString());
themeProperty.setFolderName(themePath.getFileName().toString());
themeProperty.setHasOptions(hasOptions(themePath)); themeProperty.setHasOptions(hasOptions(themePath));
themeProperty.setActivated(false); themeProperty.setActivated(false);

2
src/main/resources/templates/common/macro/theme_option_marco.ftl
View File

@ -69,7 +69,7 @@
*/ */
function updateTheme(theme, e) { function updateTheme(theme, e) {
$(e).button('loading'); $(e).button('loading');
$.get('/admin/themes/pull',{'themeName': theme},function (data) { $.get('/admin/themes/pull',{'themeId': theme},function (data) {
if (data.code === 1) { if (data.code === 1) {
halo.showMsgAndParentRedirect(data.msg, 'success', 1000, '/admin/themes'); halo.showMsgAndParentRedirect(data.msg, 'success', 1000, '/admin/themes');
} else { } else {