diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index 50c3df593a..004d8f5146 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -571,8 +571,6 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements private void initFirstTabpanel() { adTabbox.getSelectedTabpanel().query(m_onlyCurrentRows, m_onlyCurrentDays, MRole.getDefault().getMaxQueryRecords()); adTabbox.getSelectedTabpanel().activate(true); - - Events.postEvent(new Event(CompositeADTabbox.ON_POST_INIT_EVENT, adTabbox.getComponent(), null)); } /** @@ -2635,6 +2633,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements } private void updateUI(ProcessInfo pi) { + + // Timeout if (pi.isTimeout()) // set temporarily to R/O Env.setContext(ctx, curWindowNo, "Processed", "Y"); @@ -2648,7 +2648,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements String logInfo = pi.getLogInfo(); if (logInfo.length() > 0) FDialog.info(curWindowNo, this.getComponent(), Env.getHeader(ctx, curWindowNo), - pi.getTitle() + "
" + logInfo); + pi.getTitle() + "
" + logInfo); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java index be9bd17eac..05370d38b9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java @@ -42,7 +42,6 @@ import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zk.ui.sys.ExecutionCtrl; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Menuitem; import org.zkoss.zul.Vlayout; @@ -202,20 +201,6 @@ public class CompositeADTabbox extends AbstractADTabbox } }); - layout.addEventListener(ON_POST_INIT_EVENT, new EventListener() { - @Override - public void onEvent(Event event) throws Exception { - ExecutionCtrl ctrl = (ExecutionCtrl) Executions.getCurrent(); - Event evt = ctrl.getNextEvent(); - if (evt != null) { - Events.sendEvent(evt); - Events.postEvent(new Event(ON_POST_INIT_EVENT, layout)); - return; - } - LayoutUtils.redraw(layout); - } - }); - return layout; } diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 8b67b7c6cf..2a5b27e39a 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -546,7 +546,7 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none { } .adwindow-gridview-detail { - height: 40%; + height: 200px; } .adwindow-gridview-detail + .z-south-splt {