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

IDEMPIERE-369 Master Detail layout improvements. Revert back to pixel height for adwindow-gridview-detail due to performance issue.

This commit is contained in:
Heng Sin Low 2012-11-30 17:56:25 +08:00
parent 566df6608e
commit e852eefa2e
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,8 +571,6 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
private void initFirstTabpanel() { private void initFirstTabpanel() {
adTabbox.getSelectedTabpanel().query(m_onlyCurrentRows, m_onlyCurrentDays, MRole.getDefault().getMaxQueryRecords()); adTabbox.getSelectedTabpanel().query(m_onlyCurrentRows, m_onlyCurrentDays, MRole.getDefault().getMaxQueryRecords());
adTabbox.getSelectedTabpanel().activate(true); 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) { private void updateUI(ProcessInfo pi) {
// Timeout // Timeout
if (pi.isTimeout()) // set temporarily to R/O if (pi.isTimeout()) // set temporarily to R/O
Env.setContext(ctx, curWindowNo, "Processed", "Y"); Env.setContext(ctx, curWindowNo, "Processed", "Y");
@ -2648,7 +2648,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
String logInfo = pi.getLogInfo(); String logInfo = pi.getLogInfo();
if (logInfo.length() > 0) if (logInfo.length() > 0)
FDialog.info(curWindowNo, this.getComponent(), Env.getHeader(ctx, curWindowNo), FDialog.info(curWindowNo, this.getComponent(), Env.getHeader(ctx, curWindowNo),
pi.getTitle() + "<br>" + logInfo); pi.getTitle() + "<br>" + logInfo);
} }
/** /**

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
View File

@ -42,7 +42,6 @@ import org.zkoss.zk.ui.HtmlBasedComponent;
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;
import org.zkoss.zk.ui.sys.ExecutionCtrl;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Menuitem; import org.zkoss.zul.Menuitem;
import org.zkoss.zul.Vlayout; import org.zkoss.zul.Vlayout;
@ -202,20 +201,6 @@ public class CompositeADTabbox extends AbstractADTabbox
} }
}); });
layout.addEventListener(ON_POST_INIT_EVENT, new EventListener<Event>() {
@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; return layout;
} }

2
org.adempiere.ui.zk/theme/default/css/theme.css.dsp
View File

@ -546,7 +546,7 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
} }
.adwindow-gridview-detail { .adwindow-gridview-detail {
height: 40%; height: 200px;
} }
.adwindow-gridview-detail + .z-south-splt { .adwindow-gridview-detail + .z-south-splt {