From 5963b4ff320fdf95d7aca92035de0a37928c80fa Mon Sep 17 00:00:00 2001 From: Diego Ruiz Date: Thu, 17 May 2018 14:43:59 +0200 Subject: [PATCH] IDEMPIERE-3715 Improve FDialog to receive arguments for the AD_Message in special cases --- .../WEB-INF/src/org/adempiere/webui/window/FDialog.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 58710d4a7c..54ae512ed2 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 @@ -373,7 +373,7 @@ public class FDialog * @return true, if OK */ - public static boolean ask(String title, int windowNo, Component comp, String adMessage, final Callback callback) + public static boolean ask(String title, int windowNo, Component comp, String adMessage, final Callback callback, Object ... args) { Callback msgCallback = null; if (callback != null) @@ -386,7 +386,12 @@ public class FDialog } }; } - String s = Msg.getMsg(Env.getCtx(), adMessage).replace("\n", "
"); + String s; + if (args != null && args.length > 0) + s = Msg.getMsg(Env.getCtx(), adMessage, args); + else + s = Msg.getMsg(Env.getCtx(), adMessage); + s = s.replace("\n", "
"); int response = Messagebox.showDialog(s, title, Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION, msgCallback, (msgCallback == null));