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

IDEMPIERE-4931 Running jobs never stop (#1143) 

* IDEMPIERE-4931 Running jobs never stop

* Set back default to empty when user preference is None
This commit is contained in:
Carlos Ruiz 2022-01-26 02:54:22 +01:00 committed by GitHub
parent dc181deff8
commit 7689183b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Desktop; import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.HtmlBasedComponent;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
@ -105,7 +106,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
/** /**
* *
*/ */
private static final long serialVersionUID = -7374210834757533221L; private static final long serialVersionUID = 484056046177205235L;
private static final String ON_COMPLETE = "onComplete"; private static final String ON_COMPLETE = "onComplete";
private static final String ON_STATUS_UPDATE = "onStatusUpdate"; private static final String ON_STATUS_UPDATE = "onStatusUpdate";
@ -120,6 +121,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
private ProcessParameterPanel parameterPanel = null; private ProcessParameterPanel parameterPanel = null;
private Checkbox runAsJobField = null; private Checkbox runAsJobField = null;
private Label notificationTypeLabel = null;
private WTableDirEditor notificationTypeField = null; private WTableDirEditor notificationTypeField = null;
private BusyDialog progressWindow; private BusyDialog progressWindow;
@ -339,7 +341,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
Div div = new Div(); Div div = new Div();
div.setStyle("text-align: right;"); div.setStyle("text-align: right;");
div.appendChild(new Label(Msg.getElement(m_ctx, MPInstance.COLUMNNAME_NotificationType))); notificationTypeLabel = new Label(Msg.getElement(m_ctx, MPInstance.COLUMNNAME_NotificationType));
div.appendChild(notificationTypeLabel);
row.appendChild(div); row.appendChild(div);
MLookupInfo info = MLookupFactory.getLookup_List(Env.getLanguage(m_ctx), MPInstance.NOTIFICATIONTYPE_AD_Reference_ID); MLookupInfo info = MLookupFactory.getLookup_List(Env.getLanguage(m_ctx), MPInstance.NOTIFICATIONTYPE_AD_Reference_ID);
@ -356,7 +359,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
String notificationType = user.getNotificationType(); String notificationType = user.getNotificationType();
if (!MPInstance.NOTIFICATIONTYPE_None.equals(notificationType)) if (!MPInstance.NOTIFICATIONTYPE_None.equals(notificationType))
notificationTypeField.setValue(notificationType); notificationTypeField.setValue(notificationType);
row.appendChild(notificationTypeField.getComponent()); row.appendChild(notificationTypeField.getComponent());
runAsJobField.setChecked(MSysConfig.getBooleanValue(MSysConfig.BACKGROUND_JOB_BY_DEFAULT, false)); runAsJobField.setChecked(MSysConfig.getBooleanValue(MSysConfig.BACKGROUND_JOB_BY_DEFAULT, false));
@ -672,6 +675,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
else else
chooseSaveParameter(saveName, lastRun); chooseSaveParameter(saveName, lastRun);
}else if (event.getTarget().equals(bOK)){ }else if (event.getTarget().equals(bOK)){
if (runAsJobField.isChecked() && getNotificationType() == null)
throw new WrongValueException(notificationTypeField.getComponent(), Msg.getMsg(m_ctx, "FillMandatory") + notificationTypeLabel.getValue());
saveReportOption(); saveReportOption();
} }
} }
@ -892,6 +897,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
instance.setIsRunAsJob(true); instance.setIsRunAsJob(true);
instance.setIsProcessing(true); instance.setIsProcessing(true);
instance.setNotificationType(getNotificationType()); instance.setNotificationType(getNotificationType());
if (instance.getNotificationType() == null)
instance.setNotificationType(MPInstance.NOTIFICATIONTYPE_Notice);
instance.setReportType(m_pi.getReportType()); instance.setReportType(m_pi.getReportType());
instance.setIsSummary(m_pi.isSummary()); instance.setIsSummary(m_pi.isSummary());
instance.setAD_Language_ID(m_pi.getLanguageID()); instance.setAD_Language_ID(m_pi.getLanguageID());
@ -1171,6 +1178,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
MPInstance instance = new MPInstance(m_ctx, m_pi.getAD_PInstance_ID(), null); MPInstance instance = new MPInstance(m_ctx, m_pi.getAD_PInstance_ID(), null);
String notificationType = instance.getNotificationType(); String notificationType = instance.getNotificationType();
if (notificationType == null)
notificationType = MPInstance.NOTIFICATIONTYPE_Notice;
boolean sendEmail = notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMail) || notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMailPlusNotice); boolean sendEmail = notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMail) || notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMailPlusNotice);
boolean createNotice = notificationType.equals(MPInstance.NOTIFICATIONTYPE_Notice) || notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMailPlusNotice); boolean createNotice = notificationType.equals(MPInstance.NOTIFICATIONTYPE_Notice) || notificationType.equals(MPInstance.NOTIFICATIONTYPE_EMailPlusNotice);