Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Apr 5, 2023 · 5d34d7d · 5d34d7d
2 parents 4a842fc + c79d70b
commit 5d34d7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...com/evolveum/midpoint/gui/impl/component/data/column/PrismPropertyWrapperColumnPanel.java b/...com/evolveum/midpoint/gui/impl/component/data/column/PrismPropertyWrapperColumnPanel.java
@@ -12,6 +12,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -52,7 +53,12 @@ protected void onBeforeRender() {
                     }
                     return "";
                 }));
-                formComponent.add(new AjaxFormComponentUpdatingBehavior("blur") {
+
+                String event = "blur";
+                if (formComponent instanceof AutoCompleteTextField) {
+                    event = "change";
+                }
+                formComponent.add(new AjaxFormComponentUpdatingBehavior(event) {
 
                     private boolean lastValidationWasError = false;
 
@@ -71,6 +77,7 @@ protected void onUpdate(AjaxRequestTarget target) {
                         if (lastValidationWasError) {
                             lastValidationWasError = false;
                             target.add(getComponent());
+                            target.focusComponent(null);
                         }
                     }
 

diff --git a/...va/com/evolveum/midpoint/gui/impl/factory/panel/AttributeMappingItemPathPanelFactory.java b/...va/com/evolveum/midpoint/gui/impl/factory/panel/AttributeMappingItemPathPanelFactory.java
@@ -26,7 +26,6 @@
 import com.evolveum.midpoint.web.component.input.validator.NotNullValidator;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
-import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 
@@ -149,7 +148,6 @@ protected <C> IConverter<C> getAutoCompleteConverter(Class<C> type, IConverter<C
                     }
                 };
                 panel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
-                panel.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
                 return panel;
             }
         }