midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4672 Improve the StatusBar Menupopup to render HTML text (#553)

This commit is contained in:
Diego Ruiz 2021-01-25 17:01:14 +01:00 committed by GitHub
parent f233e29432
commit 245b471d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/process/DocumentEngine.java
View File

@ -282,10 +282,10 @@ public class DocumentEngine implements DocAction
throw new IllegalStateException("Status=" + getDocStatus() throw new IllegalStateException("Status=" + getDocStatus()
+ " - Invalid Actions: Process=" + processAction + ", Doc=" + docAction); + " - Invalid Actions: Process=" + processAction + ", Doc=" + docAction);
} }
if (m_document != null) 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); m_document.get_Logger().info ("**** Action=" + m_action + " (Prc=" + processAction + "/Doc=" + docAction + ") " + m_document);
boolean success = processIt (m_action); 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); m_document.get_Logger().fine("**** Action=" + m_action + " - Success=" + success);
return success; return success;
} // process } // process

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java
View File

@ -26,9 +26,8 @@ import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Tabpanel; import org.adempiere.webui.component.Tabpanel;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.WTextEditorDialog;
import org.compiere.process.ProcessInfoLog; 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.Component;
import org.zkoss.zk.ui.Execution; import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions; 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.Caption;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hlayout; import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Html;
import org.zkoss.zul.Separator; import org.zkoss.zul.Separator;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
@ -238,7 +238,7 @@ public class StatusBar extends Panel implements EventListener<Event>
} }
protected void createPopupContent() { protected void createPopupContent() {
Text t = new Text(m_statusText); Html t = new Html(WTextEditorDialog.sanitize(m_statusText));
msgPopupCnt.getChildren().clear(); msgPopupCnt.getChildren().clear();
msgPopupCnt.appendChild(t); msgPopupCnt.appendChild(t);
} }