Use schema provided by panel for collumn headers

Evolveum · Aug 17, 2022 · 0cf3096 · 0cf3096
1 parent f162ed5
commit 0cf3096
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -1180,8 +1180,7 @@ private boolean shouldIncludeDefaultColumns(){
     }
 
     private String getItemDisplayName(GuiObjectColumnType column){
-        ItemDefinition itemDefinition = getPageBase().getPrismContext().getSchemaRegistry()
-                .findContainerDefinitionByCompileTimeClass(getType()).findItemDefinition(column.getPath().getItemPath());
+        var itemDefinition = getContainerDefinitionForColumns().findItemDefinition(column.getPath().getItemPath());
         return itemDefinition == null ? "" : itemDefinition.getDisplayName();
     }
 

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
@@ -77,7 +77,7 @@ public MultivalueContainerListPanel(String id, Class<C> type, ContainerPanelConf
     @Override
     protected Search createSearch(Class<C> type) {
         PrismContainerDefinition<C> containerDefinition = getTypeDefinitionForSearch();
-        return SearchFactory.createContainerSearch(createTypeSearchItem(type, containerDefinition), getTypeDefinitionForSearch(),
+        return SearchFactory.createContainerSearch(createTypeSearchItem(type, containerDefinition), containerDefinition,
                 getDefaultSearchItem(), initSearchableItems(containerDefinition), getPageBase(), false);
     }
 
@@ -173,6 +173,7 @@ public List<InlineMenuItem> getDefaultMenuActions() {
         menuItems.add(new ButtonInlineMenuItem(createStringResource("pageAdminFocus.button.delete")) {
             private static final long serialVersionUID = 1L;
 
+            @Override
             public CompositedIconBuilder getIconCompositedBuilder(){
                 return getDefaultCompositedIconBuilder(GuiStyleConstants.CLASS_DELETE_MENU_ITEM);
             }
@@ -265,6 +266,7 @@ public void deleteItemPerformed(AjaxRequestTarget target, List<PrismContainerVal
 
     protected abstract boolean isCreateNewObjectVisible();
 
+    @Override
     public boolean isListPanelVisible(){
         return true;
     }