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

IDEMPIERE-5535 - Fixed warning dialog shown wrongly (#1631) 

* IDEMPIERE-5535 - Fixed warning dialog shown wrongly

* IDEMPIERE-5535 - Fixed warning dialog shown wrongly in other classes
This commit is contained in:
Diego Ruiz 2023-01-09 21:50:07 +01:00 committed by GitHub
parent 5bcf7178af
commit 920bf2d6e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -1791,7 +1791,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
isImporting = gridTable.isImporting(); isImporting = gridTable.isImporting();
} }
if (!isImporting) { if (!isImporting) {
Dialog.warn(curWindowNo, e.getAD_Message(), e.getInfo()); Dialog.warn(curWindowNo, e.getAD_Message(), e.getInfo(), null);
e.setConfirmed(true); // show just once - if MTable.setCurrentRow is involved the status event is re-issued e.setConfirmed(true); // show just once - if MTable.setCurrentRow is involved the status event is re-issued
} }
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
View File

@ -490,7 +490,7 @@ public class LoginPanel extends Window implements EventListener<Event>
} }
catch (Exception e) { catch (Exception e) {
String message = e.getMessage(); String message = e.getMessage();
Dialog.warn(0, "URLnotValid", message); Dialog.warn(0, "URLnotValid", message, null);
} }
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FDialog.java
View File

@ -103,6 +103,8 @@ public class FDialog
} }
/** /**
* @deprecated Use {@link Dialog}.warn(windowNo, adMessage, message, null) instead
*
* Display warning with warning icon * Display warning with warning icon
* @param windowNo Number of Window * @param windowNo Number of Window
* @param comp * @param comp

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -2443,7 +2443,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
String name = selected; String name = selected;
if ((fQueryName.getSelectedIndex() == 0 || name.equals(m_sNew)) && saveQuery){ // New query - needs a name if ((fQueryName.getSelectedIndex() == 0 || name.equals(m_sNew)) && saveQuery){ // New query - needs a name
Dialog.warn(m_targetWindowNo, "NeedsName", name); Dialog.warn(m_targetWindowNo, "NeedsName", name, null);
return; return;
} }
if (saveQuery){ if (saveQuery){
@ -2470,7 +2470,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
} else if (code.length() <= 0){ // Delete the query } else if (code.length() <= 0){ // Delete the query
if (uq == null) if (uq == null)
{ {
Dialog.warn(m_targetWindowNo, "NeedsQuery", name); Dialog.warn(m_targetWindowNo, "NeedsQuery", name, null);
return; return;
} }
if (uq.delete(true)) if (uq.delete(true))
@ -2479,7 +2479,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
refreshUserQueries(); refreshUserQueries();
} }
else else
Dialog.warn(m_targetWindowNo, "DeleteError", name); Dialog.warn(m_targetWindowNo, "DeleteError", name, null);
return; return;
} }
uq.setCode (code.toString()); uq.setCode (code.toString());

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
View File

@ -768,7 +768,7 @@ public class WLocationDialog extends Window implements EventListener<Event>
} }
catch (Exception e) { catch (Exception e) {
message = e.getMessage(); message = e.getMessage();
Dialog.warn(0, "URLnotValid", message); Dialog.warn(0, "URLnotValid", message, null);
} }
} }
else if (toRoute.equals(event.getTarget())) else if (toRoute.equals(event.getTarget()))
@ -787,7 +787,7 @@ public class WLocationDialog extends Window implements EventListener<Event>
} }
catch (Exception e) { catch (Exception e) {
message = e.getMessage(); message = e.getMessage();
Dialog.warn(0, "URLnotValid", message); Dialog.warn(0, "URLnotValid", message, null);
} }
} }
} }