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 d202c185ea..482b572ec5 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 @@ -573,7 +573,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements adTabbox.getSelectedTabpanel().activate(true); if (adTabbox.getSelectedTabpanel().isGridView()) { - Events.postEvent(new Event(CompositeADTabbox.ON_POST_INIT_EVENT, adTabbox.getComponent())); + Events.postEvent(new Event(CompositeADTabbox.ON_POST_INIT_EVENT, adTabbox.getComponent(), null)); } } 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 ddac360832..f2f71bb0bf 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,6 +42,7 @@ 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; @@ -204,6 +205,11 @@ 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(); + if (ctrl.getNextEvent() != null) { + Events.postEvent(new Event(ON_POST_INIT_EVENT, layout)); + return; + } LayoutUtils.redraw(layout); } }); @@ -561,7 +567,7 @@ public class CompositeADTabbox extends AbstractADTabbox detailTab.setDetailPaneMode(true, isUseVflexForDetailPane()); detailPane.setVflex(Boolean.toString(isUseVflexForDetailPane())); if (!ADTabpanel.isUseSplitViewForForm() && !headerTab.isGridView()) { - Events.echoEvent(new Event(DetailPane.ON_REDRAW_EVENT, detailPane)); + Events.postEvent(new Event(DetailPane.ON_REDRAW_EVENT, detailPane)); } } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java index 1adccecc75..846110213d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java @@ -28,6 +28,7 @@ import org.zkoss.zk.ui.Page; 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.Caption; import org.zkoss.zul.Div; @@ -396,6 +397,11 @@ public class DetailPane extends Panel implements EventListener { } else if (event.getName().equals(ADTabpanel.ON_DYNAMIC_DISPLAY_EVENT)) { updateProcessToolbar(); } else if (event.getName().equals(ON_REDRAW_EVENT)) { + ExecutionCtrl ctrl = (ExecutionCtrl) Executions.getCurrent(); + if (ctrl.getNextEvent() != null) { + Events.postEvent(new Event(ON_REDRAW_EVENT, this)); + return; + } LayoutUtils.redraw(this); } }