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

IDEMPIERE-988 Failed to process script In Advanced search for any window.

This commit is contained in:
Heng Sin Low 2013-06-24 17:45:25 +08:00
parent 079d1afa21
commit 788d932239
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,6 +911,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
getComponent().getParent().appendChild(win); getComponent().getParent().appendChild(win);
showBusyMask(win); showBusyMask(win);
LayoutUtils.openOverlappedWindow(getComponent(), win, "middle_center"); LayoutUtils.openOverlappedWindow(getComponent(), win, "middle_center");
win.focus();
} }
public void onChat() public void onChat()
@ -2607,7 +2608,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
if (mask != null && mask.getParent() != null) { if (mask != null && mask.getParent() != null) {
mask.detach(); mask.detach();
StringBuilder script = new StringBuilder("var w=zk.Widget.$('#"); StringBuilder script = new StringBuilder("var w=zk.Widget.$('#");
script.append(getComponent().getParent().getUuid()).append("');w.busy=false;"); script.append(getComponent().getParent().getUuid()).append("');if(w) w.busy=false;");
Clients.response(new AuScript(script.toString())); Clients.response(new AuScript(script.toString()));
} }
} }

3
org.adempiere.ui.zk/js/window.js
View File

@ -13,11 +13,12 @@ zk.override(zk.Widget.prototype, "canActivate",
} }
var wgt = this; var wgt = this;
while (wgt) { while (wgt) {
if (wgt.busy) { if (wgt.busy) {
if (wgt.busy.className == 'zul.wnd.Window') { if (wgt.busy.className == 'zul.wnd.Window') {
if (zUtl.isAncestor(wgt.busy, this)) { if (zUtl.isAncestor(wgt.busy, this)) {
return true; return true;
} else { } else {
jq.focusOut();
wgt.busy.focus(0); wgt.busy.focus(0);
return false; return false;
} }