From e4a7fdfbd04e37c343350667bbb3de5ff69d57a6 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Fri, 18 Jan 2013 13:57:35 +0800 Subject: [PATCH] IDEMPIERE-562 Zk: Add system property override for active theme. --- .../WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java index 0bebbc0962..fa722f6571 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java @@ -15,6 +15,7 @@ package org.adempiere.webui.theme; import org.adempiere.webui.AdempiereWebUI; import org.compiere.model.MSysConfig; +import org.compiere.util.Util; /** * @@ -48,7 +49,8 @@ public final class ThemeManager { * @return name of active theme */ public static String getTheme() { - return MSysConfig.getValue(ITheme.ZK_THEME, ITheme.ZK_THEME_DEFAULT); + String theme = System.getProperty("ZK_THEME"); + return Util.isEmpty(theme) ? MSysConfig.getValue(ITheme.ZK_THEME, ITheme.ZK_THEME_DEFAULT) : theme; } /**