diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java index 71d27ffac..ed07e2e05 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java @@ -35,6 +35,8 @@ import org.navalplanner.web.common.components.finders.FilterPair; import org.navalplanner.web.common.components.finders.IMultipleFiltersFinder; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; +import org.zkoss.zk.au.AuRequest; +import org.zkoss.zk.au.AuService; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zk.ui.WrongValueException; @@ -92,21 +94,24 @@ public class BandboxMultipleSearch extends HtmlMacroComponent { listbox.setItemRenderer(multipleFiltersFinder.getItemRenderer()); addHeaders(); - // Close bandbox for events onClick and onOK - listbox.addEventListener(Events.ON_CLICK, new EventListener() { - - @Override - public void onEvent(Event event) { - pickElementFromListAndCloseBandbox(); + setAuService(new AuService() { + @Override + public boolean service(AuRequest request, boolean everError) { + String command = request.getCommand(); + if (command.equals("closeBandbox")) { + pickElementFromListAndCloseBandbox(); + return true; } - }); + return false; + } + }); listbox.addEventListener(Events.ON_OK, new EventListener() { - @Override - public void onEvent(Event event) { + @Override + public void onEvent(Event event) { pickElementFromListAndCloseBandbox(); - } - }); + } + }); } private void initBandbox() { diff --git a/navalplanner-webapp/src/main/webapp/common/components/bandbox_search.zul b/navalplanner-webapp/src/main/webapp/common/components/bandbox_search.zul index f10d3ee5d..65775c1ca 100644 --- a/navalplanner-webapp/src/main/webapp/common/components/bandbox_search.zul +++ b/navalplanner-webapp/src/main/webapp/common/components/bandbox_search.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + - function closeBandbox(listbox) { - zkau.send({ - uuid : listbox.id, - cmd : "onClick" - }); + function closeBandbox(bandbox) { + zAu.send(new zk.Event(bandbox, "closeBandbox")); } @@ -43,7 +40,7 @@ + c:onClick="closeBandbox(this.$f().bandbox.parent);">