diff --git a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java index d1b9654c2e..63fd3fe6fd 100644 --- a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java +++ b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java @@ -282,10 +282,10 @@ public class DocumentEngine implements DocAction throw new IllegalStateException("Status=" + getDocStatus() + " - Invalid Actions: Process=" + processAction + ", Doc=" + docAction); } - if (m_document != null) - m_document.get_Logger().info ("**** Action=" + m_action + " (Prc=" + processAction + "/Doc=" + docAction + ") " + m_document); + if (m_document != null && m_document.get_Logger().isLoggable(Level.INFO)) + m_document.get_Logger().info ("**** Action=" + m_action + " (Prc=" + processAction + "/Doc=" + docAction + ") " + m_document); boolean success = processIt (m_action); - if (m_document != null) + if (m_document != null && m_document.get_Logger().isLoggable(Level.FINE)) m_document.get_Logger().fine("**** Action=" + m_action + " - Success=" + success); return success; } // process diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java index ae5552f524..9f736d07e8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java @@ -26,9 +26,8 @@ import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.Tabpanel; import org.adempiere.webui.component.Window; import org.adempiere.webui.util.ZKUpdateUtil; +import org.adempiere.webui.window.WTextEditorDialog; import org.compiere.process.ProcessInfoLog; -import org.zkoss.zul.Html; -import org.zkoss.zhtml.Text; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Execution; import org.zkoss.zk.ui.Executions; @@ -39,6 +38,7 @@ import org.zkoss.zk.ui.util.Notification; import org.zkoss.zul.Caption; import org.zkoss.zul.Div; import org.zkoss.zul.Hlayout; +import org.zkoss.zul.Html; import org.zkoss.zul.Separator; import org.zkoss.zul.Space; @@ -238,7 +238,7 @@ public class StatusBar extends Panel implements EventListener } protected void createPopupContent() { - Text t = new Text(m_statusText); + Html t = new Html(WTextEditorDialog.sanitize(m_statusText)); msgPopupCnt.getChildren().clear(); msgPopupCnt.appendChild(t); }