adding of collectionView as value in SelectableBeanContainerDataProvider

Evolveum · Nov 4, 2020 · 21b2e10 · 21b2e10
1 parent aea8842
commit 21b2e10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -140,12 +140,8 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
             public ObjectQuery getQuery() {
                 return createQuery();
             }
-
-            @Override
-            protected CompiledObjectCollectionView getCompiledObjectCollectionView() {
-                return getObjectCollectionView();
-            }
         };
+        provider.setCompiledObjectCollectionView(getObjectCollectionView());
         provider.setOptions(createOptions());
         setDefaultSorting(provider);
 

diff --git a/...in/java/com/evolveum/midpoint/web/component/data/SelectableBeanContainerDataProvider.java b/...in/java/com/evolveum/midpoint/web/component/data/SelectableBeanContainerDataProvider.java
@@ -55,6 +55,7 @@ public class SelectableBeanContainerDataProvider<C extends Containerable> extend
 
     private boolean emptyListOnNullQuery = false;
     private boolean useObjectCounting = true;
+    private CompiledObjectCollectionView objectCollectionView;
 
     // we use special options when exporting to CSV (due to bulk nature of the operation)
     private boolean export;
@@ -326,6 +327,10 @@ public boolean isOrderingDisabled() {
     }
 
     protected CompiledObjectCollectionView getCompiledObjectCollectionView() {
-        return null;
+        return objectCollectionView;
+    }
+
+    public void setCompiledObjectCollectionView(CompiledObjectCollectionView objectCollectionView) {
+        this.objectCollectionView = objectCollectionView;
     }
 }
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -202,12 +202,8 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
                     public ObjectQuery getQuery() {
                         return createQuery();
                     }
-
-                    @Override
-                    protected CompiledObjectCollectionView getCompiledObjectCollectionView() {
-                        return getObjectCollectionView();
-                    }
                 };
+                provider.setCompiledObjectCollectionView(getObjectCollectionView());
                 provider.setOptions(createOptions());
                 return provider;
             }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java
@@ -98,12 +98,8 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
             public ObjectQuery getQuery() {
                 return createQuery();
             }
-
-            @Override
-            protected CompiledObjectCollectionView getCompiledObjectCollectionView() {
-                return getObjectCollectionView();
-            }
         };
+        provider.setCompiledObjectCollectionView(getObjectCollectionView());
         provider.setOptions(createOptions());
         provider.setSort(MetadataType.F_CREATE_TIMESTAMP.getLocalPart(), SortOrder.DESCENDING);