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

IDEMPIERE-624 Null.pointer.exception in zoom to column.

This commit is contained in:
Heng Sin Low 2013-02-18 14:33:38 +08:00
parent 6a8ded433e
commit eac774fb67
4 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,6 +481,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
{ {
setActiveTab(gridWindow.getTabIndex(gTab), null); setActiveTab(gridWindow.getTabIndex(gTab), null);
gTab.navigate(i); gTab.navigate(i);
if (gc.isGridView())
gc.switchRowPresentation();
return true; return true;
} }
} }

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

@ -255,7 +255,7 @@ public class CompositeADTabbox extends AbstractADTabbox
return; return;
IADTabpanel tabPanel = (IADTabpanel) event.getTarget(); IADTabpanel tabPanel = (IADTabpanel) event.getTarget();
if (tabPanel != headerTab) { if (tabPanel != headerTab && headerTab.getDetailPane() != null) {
if (b != null && b.booleanValue()) { if (b != null && b.booleanValue()) {
onActivateDetail(tabPanel); onActivateDetail(tabPanel);
} }

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
View File

@ -46,6 +46,7 @@ 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.util.Clients; import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Column; import org.zkoss.zul.Column;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Frozen; import org.zkoss.zul.Frozen;
@ -632,11 +633,8 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace
Component c = (Component) o; Component c = (Component) o;
if (!c.isVisible()) if (!c.isVisible())
continue; continue;
c = c.getFirstChild(); if (c instanceof Cell) {
if (c == null) cmp = c;
continue;
if (c.getNextSibling() != null) {
cmp = c.getNextSibling();
break; break;
} }
} }

16
org.adempiere.ui.zk/js/layout.js
View File

@ -1,25 +1,41 @@
function ad_deferRenderBorderLayout(uuid, timeout) { function ad_deferRenderBorderLayout(uuid, timeout) {
try {
var meta = zk.Widget.$(uuid); var meta = zk.Widget.$(uuid);
if (meta) { if (meta) {
setTimeout("_ad_deferBDL('"+uuid+"')", timeout); setTimeout("_ad_deferBDL('"+uuid+"')", timeout);
} }
} catch (err) {
if (console) console.log(err);
}
} }
function _ad_deferBDL(uuid) { function _ad_deferBDL(uuid) {
try {
var cmp = zk.Widget.$(uuid); var cmp = zk.Widget.$(uuid);
if (cmp) { cmp.resize(); } if (cmp) { cmp.resize(); }
} catch (err) {
if (console) console.log(err);
}
} }
function _ad_closeBuble(link) { function _ad_closeBuble(link) {
try {
var parent = link.parentsUntil("simileAjax-bubble-contentContainer"); var parent = link.parentsUntil("simileAjax-bubble-contentContainer");
var btn = parent.next(); var btn = parent.next();
btn.click(); btn.click();
} catch (err) {
if (console) console.log(err);
}
} }
function scrollToRow(uuid){ function scrollToRow(uuid){
try {
var cmp = zk.Widget.$(uuid); var cmp = zk.Widget.$(uuid);
if (cmp) { if (cmp) {
cmp.scrollIntoView(); cmp.scrollIntoView();
cmp.focus(); cmp.focus();
} }
} catch (err) {
if (console) console.log(err);
}
} }