From eaaa26774cd7aa1e0d5ee1bb44c20339bf24095e Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Fri, 29 Apr 2022 17:22:01 +0200 Subject: [PATCH] =?UTF-8?q?IDEMPIERE-5280=20:=20Avoid=20Msg.getMsg:=20NOT?= =?UTF-8?q?=20found=20log=20when=20confirming=20an=20a=E2=80=A6=20(#1308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * IDEMPIERE-5280 : Avoid Msg.getMsg: NOT found log when confirming an action on a document * IDEMPIERE-5280 : Avoid Msg.getMsg: NOT found log when confirming an action on a document - fix suggested by hengsin fix windowNo Co-Authored-By: hengsin <152246+hengsin@users.noreply.github.com> * IDEMPIERE-5280 : Avoid Msg.getMsg: NOT found log when confirming an action on a document - Fix vertical alignment of message Also fix it in another method Co-Authored-By: hengsin <152246+hengsin@users.noreply.github.com> Co-authored-by: hengsin <152246+hengsin@users.noreply.github.com> --- .../org/adempiere/webui/panel/WDocActionPanel.java | 2 +- .../src/org/adempiere/webui/window/FDialog.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java index 3d00d56904..03392b8435 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java @@ -379,7 +379,7 @@ public class WDocActionPanel extends Window implements EventListener, Dia String docAction = lstDocAction.getSelectedItem().getLabel(); MessageFormat mf = new MessageFormat(Msg.getMsg(Env.getAD_Language(Env.getCtx()), "ConfirmOnDocAction")); Object[] arguments = new Object[]{docAction}; - FDialog.ask(0, this, mf.format(arguments), new Callback() { + FDialog.ask(gridTab.getWindowNo(), this, "", mf.format(arguments), new Callback() { @Override public void onCallback(Boolean result) { if(result) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java index ff925623e0..5fa788a4ac 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java @@ -315,7 +315,11 @@ public class FDialog if (adMessage != null && !adMessage.equals("")) out.append(Msg.getMsg(Env.getCtx(), adMessage)); if (msg != null && msg.length() > 0) - out.append("\n").append(msg); + { + if (out.length() > 0) + out.append("\n"); + out.append(msg); + } String s = out.toString().replace("\n", "
"); Callback msgCallback = null; @@ -579,7 +583,11 @@ public class FDialog if (adMessage != null && !adMessage.equals("")) out.append(Msg.getMsg(Env.getCtx(), adMessage)); if (msg != null && msg.length() > 0) - out.append("\n").append(msg); + { + if (out.length() > 0) + out.append("\n"); + out.append(msg); + } String s = out.toString().replace("\n", "
"); int response = Messagebox.showDialog(s, title, Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION, msgCallback, (msgCallback == null));