From 9be35f0eb43f4d9e0cedba6416608e5e25ff29cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Fri, 26 Jan 2024 10:52:01 +0100
Subject: [PATCH] Entity selector bug fixed

---
 .../lis/ui/editor/selector/EntitySelectorModel.java  | 12 ++++++++++++
 .../main/resources/web/widget/entity-selector.zul    |  9 +++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/editor/selector/EntitySelectorModel.java b/lis-ui/src/main/java/hu/user/lis/ui/editor/selector/EntitySelectorModel.java
index 82533fd..2c1c85e 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/editor/selector/EntitySelectorModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/editor/selector/EntitySelectorModel.java
@@ -12,8 +12,10 @@ import org.zkoss.bind.Converter;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
+import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zk.ui.event.OpenEvent;
+import org.zkoss.zul.Bandbox;
 import org.zkoss.zul.impl.XulElement;
 
 import java.util.AbstractMap;
@@ -59,6 +61,16 @@ public abstract class EntitySelectorModel<T> {
         reset();
     }
 
+    @Command
+    public void onEntityBandPopupClick(@ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
+        Event event = ctx.getTriggerEvent();
+        try {
+            ((Bandbox) event.getTarget().getParent().getParent().getParent()).close();
+        } catch (Exception e) {
+            log.error("Internal error: {}", e.getMessage());
+        }
+    }
+
     protected abstract void search(String filter);
 
     protected abstract void reset();
diff --git a/lis-ui/src/main/resources/web/widget/entity-selector.zul b/lis-ui/src/main/resources/web/widget/entity-selector.zul
index 357c1cd..80bfecb 100644
--- a/lis-ui/src/main/resources/web/widget/entity-selector.zul
+++ b/lis-ui/src/main/resources/web/widget/entity-selector.zul
@@ -8,9 +8,8 @@
             <attribute c:name="_doKeyDown">
                 <![CDATA[
                             function (evt) {
-                                var selectorId = "${selector_id}";
                                 console.log("this", this);
-
+                                var selectorId = "${selector_id}";
                                 var bandBox = zk.$("$entityBandBox_" + selectorId);
                                 var bandPopup = zk.$("$entityBandPopup_" + selectorId);
 
@@ -39,14 +38,12 @@
             <bandpopup id="entityBandPopup_${selector_id}" width="400px">
                 <listbox id="entityList_${selector_id}" height="250px"
                          model="@bind(vmEntity.dataModel)"
-                         selectedItem="@bind(vmEntity.selectedEntity)"
-                         onClick="entityBandBox_${selector_id}.close()"
-                         onDoubleClick="entityBandBox_${selector_id}.close()">
+                         selectedItem="@bind(vmEntity.selectedEntity)">
                     <listhead visible="false">
                         <listheader label="name" vflex="max"/>
                     </listhead>
                     <template name="model">
-                        <listitem>
+                        <listitem onDoubleClick="@command('onEntityBandPopupClick')">
                             <listcell label="@load(each) @converter(vmEntity.displayConverter)"/>
                         </listitem>
                     </template>
-- 
2.54.0