some fixes for full text search in the popup window

Evolveum · Apr 30, 2017 · 377dba1 · 377dba1
1 parent 8095256
commit 377dba1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
@@ -45,7 +45,7 @@
         </div>
 
         <div class="form-group" style="vertical-align: top;" wicket:id="searchContainer">
-            <a wicket:id="searchSimple" class="btn btn-sm btn-primary">
+            <a wicket:id="searchSimple" class="btn btn-sm btn-primary" about="searchSimple">
                 <i class="fa fa-search fa-lg"/>
             </a>
             <div wicket:id="searchDropdown">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -185,7 +185,6 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 searchPerformed(target);
             }
         };
-        searchSimple.setMarkupId(ID_SEARCH_SIMPLE);
         searchSimple.add(new VisibleEnableBehaviour() {
 
             @Override
@@ -360,8 +359,8 @@ protected void onUpdate(AjaxRequestTarget target) {
             public void bind(Component component) {
                 super.bind( component );
 
-                component.add( AttributeModifier.replace( "onkeydown", Model.of("if(event.keyCode == 13) {document.getElementById('"+
-                        ID_SEARCH_SIMPLE +"').click();}") ) );
+                component.add( AttributeModifier.replace( "onkeydown",
+                        Model.of("if(event.keyCode == 13) {$('[about=\"searchSimple\"]').click();}") ) );
             }
         });
         fullTextInput.setOutputMarkupId(true);