MID-2856 fixing Request a role panel issues

Evolveum · Apr 12, 2016 · beba49b · beba49b
1 parent b8de877
commit beba49b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/.../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java b/.../java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
@@ -83,6 +83,7 @@ public class MultipleAssignmentSelectorPanel<F extends FocusType, H extends Focu
     private List<OrgType> tenantEditorObject = new ArrayList<>();
     private List<OrgType> orgEditorObject = new ArrayList<>();
     private PrismObject<UserType> user;
+    private ObjectQuery dataProviderQuery;
     private ObjectFilter authorizedRolesFilter = null;
     private IModel<ObjectFilter> filterModel = null;
     private static final Trace LOGGER = TraceManager.getTrace(MultipleAssignmentSelectorPanel.class);
@@ -223,22 +224,31 @@ private void deleteFromAssignmentsModel(AjaxRequestTarget target, MultipleAssign
     }
 
     public ObjectDataProvider getAvailableAssignmentsDataProvider() {
-        return new ObjectDataProvider<AssignmentEditorDto, F>(this, type) {
+        ObjectDataProvider<AssignmentEditorDto, F> provider = new ObjectDataProvider<AssignmentEditorDto, F>(this, type) {
 
             @Override
             public AssignmentEditorDto createDataObjectWrapper(PrismObject<F> obj) {
                 return AssignmentEditorDto.createDtoFromObject(obj.asObjectable(), UserDtoStatus.MODIFY, getPageBase());
             }
 
+            @Override
+            public void setQuery(ObjectQuery query) {
+                super.setQuery(query);
+                dataProviderQuery = query;
+            }
+
             @Override
             public ObjectQuery getQuery() {
-                ObjectQuery query = new ObjectQuery();
+                if (dataProviderQuery == null){
+                    dataProviderQuery = new ObjectQuery();
+                }
                 if (filterModel != null && filterModel.getObject() != null){
-                    query.addFilter(filterModel.getObject());
+                    dataProviderQuery.addFilter(filterModel.getObject());
                 }
-                return query;
+                return dataProviderQuery;
             }
         };
+        return provider;
     }
 
     private  IModel<ObjectFilter> getFilterModel(){

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
@@ -27,10 +27,12 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -366,6 +368,14 @@ protected void onUpdate(AjaxRequestTarget target) {
                     //nothing to do, just update model data
                 }
             });
+            input.add(new Behavior() {
+                @Override
+                public void bind(Component component) {
+                    super.bind( component );
+
+                    component.add( AttributeModifier.replace( "onkeydown", Model.of( "if(event.keyCode == 13) {event.preventDefault();}" ) ) );
+                }
+            });
             input.setOutputMarkupId(true);
             add(input);
         }

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
@@ -38,6 +38,7 @@
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -48,6 +49,7 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.util.time.Duration;
 
@@ -331,6 +333,15 @@ public boolean isVisible() {
         propList.add(properties);
 
         TextField addText = new TextField(ID_ADD_TEXT, new PropertyModel(moreDialogModel, MoreDialogDto.F_NAME_FILTER));
+        addText.add(new Behavior() {
+            @Override
+            public void bind(Component component) {
+                super.bind( component );
+
+                component.add( AttributeModifier.replace( "onkeydown", Model.of("if(event.keyCode == 13) {event.preventDefault();}") ) );
+            }
+        });
+
         popover.add(addText);
         addText.add(new AjaxFormComponentUpdatingBehavior("keyup") {