fix for MID-8893 - no collection name parameter for popup, use the de…

…fault one, such as allUsers, allResources,..
Evolveum · Jul 18, 2023 · 910f0d5 · 910f0d5
1 parent dd67038
commit 910f0d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
@@ -12,6 +12,7 @@
 import java.util.List;
 
 import com.evolveum.midpoint.gui.impl.util.TableUtil;
+import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.gui.api.component.data.provider.ISelectableDataProvider;
 
@@ -179,4 +180,9 @@ protected UserProfileStorage.TableId getTableId() {
     protected boolean isCollectionViewPanelForCompiledView() {
         return false;
     }
+
+    @Override
+    protected String getCollectionNameFromPageParameters() {
+        return null;
+    }
 }
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -797,11 +797,15 @@ public CompiledObjectCollectionView getObjectCollectionView() {
         if (view != null) {
             return view;
         }
-        String collectionName = WebComponentUtil.getCollectionNameParameterValueAsString(getPageBase());
+        String collectionName = getCollectionNameFromPageParameters();
         return getPageBase().getCompiledGuiProfile().findObjectCollectionView
                 (WebComponentUtil.anyClassToQName(getPageBase().getPrismContext(), getType()), collectionName);
     }
 
+    protected String getCollectionNameFromPageParameters() {
+        return WebComponentUtil.getCollectionNameParameterValueAsString(getPageBase());
+    }
+
     private CompiledObjectCollectionView getCompiledCollectionViewFromPanelConfiguration() {
         if (compiledCollectionViewFromPanelConfiguration != null) {
             return compiledCollectionViewFromPanelConfiguration;