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

IDEMPIERE-3071 Cache Reset process dont work if set Show Help = "Run silently - Take Defaults"

This commit is contained in:
Carlos Ruiz 2016-04-17 21:05:31 -07:00
parent 8a22cf781a
commit 8d87994630
5 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
View File

@ -48,6 +48,7 @@ import org.adempiere.util.Callback;
import org.adempiere.util.IProcessUI;
import org.compiere.model.MPInstance;
import org.compiere.model.MPInstancePara;
import org.compiere.model.MProcess;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
@ -362,14 +363,14 @@ public class ProcessDialog extends CFrame
centerPanel.add(separator, BorderLayout.NORTH);
centerPanel.add(parameterPanel, BorderLayout.CENTER);
} else {
if (m_ShowHelp != null && m_ShowHelp.equals("N")) {
if (m_ShowHelp != null && MProcess.SHOWHELP_DonTShowHelp.equals(m_ShowHelp)) {
bOK.doClick(); // don't ask first click
// anyway show resulting window
}
}
// Check if the process is a silent one
if(m_ShowHelp != null && m_ShowHelp.equals("S"))
if(m_ShowHelp != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(m_ShowHelp))
bOK.doClick();
querySaved();
@ -548,8 +549,8 @@ public class ProcessDialog extends CFrame
if (m_IsReport && !pi.isError())
bOK.doClick();
// If the process is a silent one and no errors occured, close the dialog
if(m_ShowHelp != null && m_ShowHelp.equals("S"))
// If the process is a silent one and no errors occurred, close the dialog
if(m_ShowHelp != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(m_ShowHelp))
bOK.doClick();
} // unlockUI
@ -560,7 +561,7 @@ public class ProcessDialog extends CFrame
public boolean isUILocked()
{
return m_isLocked;
} // isLoacked
} // isUILocked
/**
* Method to be executed async.

5
org.adempiere.ui.swing/src/org/compiere/apps/ProcessModalDialog.java
View File

@ -33,6 +33,7 @@ import javax.swing.JSeparator;
import org.adempiere.exceptions.DBException;
import org.adempiere.util.IProcessUI;
import org.compiere.model.MProcess;
import org.compiere.process.ProcessInfo;
import org.compiere.swing.CButton;
import org.compiere.swing.CDialog;
@ -310,7 +311,7 @@ public class ProcessModalDialog extends CDialog
centerPanel.add(separator, BorderLayout.NORTH);
centerPanel.add(parameterPanel, BorderLayout.CENTER);
} else {
if (m_ShowHelp != null && m_ShowHelp.equals("N")) {
if (m_ShowHelp != null && MProcess.SHOWHELP_DonTShowHelp.equals(m_ShowHelp)) {
m_autoStart = true;
}
if (m_autoStart)
@ -318,7 +319,7 @@ public class ProcessModalDialog extends CDialog
}
// Check if the process is a silent one
if(m_ShowHelp != null && m_ShowHelp.equals("S"))
if(m_ShowHelp != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(m_ShowHelp))
bOK.doClick();
dialog.revalidate();

2
org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameter.java
View File

@ -555,7 +555,7 @@ public class ProcessParameter extends CDialog
{
MProcess m_process = new MProcess(Env.getCtx(),
m_processInfo.getAD_Process_ID(), null);
if(m_process.getShowHelp() != null && m_process.getShowHelp().equals("S"))
if(m_process.getShowHelp() != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(m_process.getShowHelp()))
{
// It is defined as a silent process
if(saveParameters())

11
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
View File

@ -221,26 +221,29 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
m_pi.setTitle(m_Name);
parameterPanel = new ProcessParameterPanel(m_WindowNo, m_pi);
layout();
if ( !parameterPanel.init() ) {
if (m_ShowHelp != null && m_ShowHelp.equals("N"))
if (m_ShowHelp != null && MProcess.SHOWHELP_DonTShowHelp.equals(m_ShowHelp))
autoStart = true;
if (autoStart)
{
bOK.setDisabled(true);
bCancel.setDisabled(true);
autoStart();
return true;
}
}
// Check if the process is a silent one
if (isValid() && m_ShowHelp != null && m_ShowHelp.equals("S"))
if (isValid() && m_ShowHelp != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(m_ShowHelp))
{
bOK.setDisabled(true);
bCancel.setDisabled(true);
autoStart();
return true;
}
layout();
return true;
}

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -39,6 +39,7 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.window.FDialog;
import org.adempiere.webui.window.SimplePDFViewer;
import org.compiere.model.MProcess;
import org.compiere.model.X_AD_CtxHelp;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
@ -270,6 +271,7 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
}
private void showBusyMask(Window window) {
if (getParent() != null) {
getParent().appendChild(getMask());
StringBuilder script = new StringBuilder("var w=zk.Widget.$('#");
script.append(getParent().getUuid()).append("');");
@ -279,6 +281,7 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
script.append("w.busy=true;");
}
Clients.response(new AuScript(script.toString()));
}
}
private void hideBusyMask()
@ -322,9 +325,11 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
bOK.setLabel(Msg.getMsg(Env.getCtx(), "Parameter"));
bOK.setImage(ThemeManager.getThemeResource("images/Reset16.png"));
bOK.setDisabled(false);
bCancel.setLabel(Msg.getMsg(Env.getCtx(), "Close"));
bCancel.setImage(ThemeManager.getThemeResource("images/Cancel16.png"));
bCancel.setDisabled(false);
isParameterPage = false;
@ -458,8 +463,8 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
{
//
if (!afterProcessTask()) {
// If the process is a silent one and no errors occured, close the dialog
if(getShowHelp() != null && getShowHelp().equals("S"))
// If the process is a silent one and no errors occurred, close the dialog
if(getShowHelp() != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(getShowHelp()))
this.dispose();
}
}
@ -570,8 +575,8 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
}
}
// If the process is a silent one and no errors occured, close the dialog
if(getShowHelp() != null && getShowHelp().equals("S"))
// If the process is a silent one and no errors occurred, close the dialog
if(getShowHelp() != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(getShowHelp()))
this.dispose();
}
@ -653,8 +658,8 @@ public class ProcessDialog extends AbstractProcessDialog implements EventListene
}
}
// If the process is a silent one and no errors occured, close the dialog
if(getShowHelp() != null && getShowHelp().equals("S"))
// If the process is a silent one and no errors occurred, close the dialog
if(getShowHelp() != null && MProcess.SHOWHELP_RunSilently_TakeDefaults.equals(getShowHelp()))
this.dispose();
}