This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new b632308  [SYNCOPE-1500] fix
b632308 is described below

commit b63230897c6f386929e61d30efb76fbd75b158ed
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Oct 31 15:16:30 2019 +0100

    [SYNCOPE-1500] fix
---
 .../client/console/panels/ConnObjectListViewPanel.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
index 920ec84..9bb3372 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
@@ -245,7 +245,7 @@ public abstract class ConnObjectListViewPanel extends Panel 
{
 
             @Override
             public void onClick(final AjaxRequestTarget target) {
-                final List<ConnObjectTO> listOfItems = 
reloadItems(resource.getKey(), anyType, nextPageCookie, null);
+                List<ConnObjectTO> listOfItems = 
reloadItems(resource.getKey(), anyType, nextPageCookie, getFiql());
                 target.add(arrows);
                 send(ConnObjectListViewPanel.this, Broadcast.DEPTH, new 
ListViewReload<>(listOfItems, target));
             }
@@ -261,11 +261,8 @@ public abstract class ConnObjectListViewPanel extends 
Panel {
     public void onEvent(final IEvent<?> event) {
         if (event.getPayload() instanceof SearchClausePanel.SearchEvent) {
             this.nextPageCookie = null;
-            final AjaxRequestTarget target = 
SearchClausePanel.SearchEvent.class.cast(event.getPayload()).getTarget();
-            List<ConnObjectTO> listOfItems = reloadItems(resource.getKey(), 
anyType, null, SearchUtils.buildFIQL(
-                    
ConnObjectListViewPanel.this.searchPanel.getModel().getObject(),
-                    SyncopeClient.getConnObjectTOFiqlSearchConditionBuilder(),
-                    
ConnObjectListViewPanel.this.searchPanel.getAvailableSchemaTypes()));
+            AjaxRequestTarget target = 
SearchClausePanel.SearchEvent.class.cast(event.getPayload()).getTarget();
+            List<ConnObjectTO> listOfItems = reloadItems(resource.getKey(), 
anyType, null, getFiql());
             target.add(arrows);
             send(ConnObjectListViewPanel.this, Broadcast.DEPTH, new 
ListViewReload<>(listOfItems, target));
         } else {
@@ -317,4 +314,11 @@ public abstract class ConnObjectListViewPanel extends 
Panel {
         return new ConnObjectSearchPanel.Builder(resource, anyTypeKind, 
anyType,
                 new 
ListModel<>(clauses)).required(true).enableSearch().build(id);
     }
+
+    private String getFiql() {
+        return SearchUtils.buildFIQL(
+                searchPanel.getModel().getObject(),
+                SyncopeClient.getConnObjectTOFiqlSearchConditionBuilder(),
+                searchPanel.getAvailableSchemaTypes());
+    }
 }

Reply via email to