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

Evolveum · Oct 22, 2014 · 34f619c · 34f619c
2 parents 603661b + a496566
commit 34f619c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
@@ -485,13 +485,14 @@ private LoadableModel<Integer> createTotalsModel(final SynchronizationSituationT
 
             @Override
             protected Integer load() {
-//                ObjectFilter resourceFilter = createResourceQueryFilter();
-                ObjectFilter resourceFilter = createObjectQuery().getFilter();        // leads to invalid filters [e.g. AND(something,null)]
+                ObjectFilter resourceFilter = createResourceQueryFilter();
 
                 if (resourceFilter == null) {
                     return 0;
                 }
 
+                ObjectFilter filter = createObjectQuery().getFilter();
+
                 Collection<SelectorOptions<GetOperationOptions>> options =
                         SelectorOptions.createCollection(GetOperationOptions.createRaw());
                 Task task = createSimpleTask(OPERATION_GET_TOTALS);
@@ -500,7 +501,7 @@ protected Integer load() {
                     EqualFilter situationFilter = EqualFilter.createEqual(ShadowType.F_SYNCHRONIZATION_SITUATION, ShadowType.class,
                             getPrismContext(), null, situation);
 
-                    AndFilter andFilter = AndFilter.createAnd(resourceFilter, situationFilter);
+                    AndFilter andFilter = AndFilter.createAnd(filter, situationFilter);
                     ObjectQuery query = ObjectQuery.createObjectQuery(andFilter);
 
                     return getModelService().countObjects(ShadowType.class, query, options, task, result);
@@ -739,7 +740,7 @@ private void listSyncDetailsPerformed(AjaxRequestTarget target) {
 
         TablePanel table = getAccountsTable();
         ObjectDataProvider provider = (ObjectDataProvider) table.getDataTable().getDataProvider();
-        provider.setQuery(ObjectQuery.createObjectQuery(createResourceQueryFilter()));
+        provider.setQuery(createObjectQuery());
         table.getDataTable().setCurrentPage(0);
 
         refreshEverything(target);
@@ -936,7 +937,9 @@ private ObjectQuery createObjectQuery(){
         AndFilter searchFilter;
         if(!filters.isEmpty()){
             searchFilter = AndFilter.createAnd(filters);
-            query.setFilter(AndFilter.createAnd(searchFilter, createResourceQueryFilter()));
+
+            ObjectFilter resourceFilter = createResourceQueryFilter();
+            query.setFilter(resourceFilter != null ? AndFilter.createAnd(searchFilter, resourceFilter) : searchFilter);
         } else {
             query.setFilter(createResourceQueryFilter());
         }