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

Replace themeName with themeId

pull/146/head
johnniang 2019-04-20 16:31:47 +08:00
parent feeecc30b2
commit e46c1f8740
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);
} }

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

@ -331,7 +331,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);

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 {