MID-7633:fix for using css class for new object button based on confi…

…guration
Evolveum · Mar 16, 2022 · 257c86d · 257c86d
1 parent 3716078
commit 257c86d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -180,7 +180,7 @@ private Component createNewObjectButton(String buttonId) {
         builder.setBasicIcon(WebComponentUtil.getIconCssClass(newObjectButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
                 .appendColorHtmlValue(WebComponentUtil.getIconColor(newObjectButtonDisplayType));
         CompiledObjectCollectionView view = getObjectCollectionView();
-        if (ObjectCollectionViewUtil.isArchetypedCollectionView(view)) {
+        if (GuiDisplayTypeUtil.existsIconDisplay(view) && !isCollectionViewPanelForWidget()) {
             IconType plusIcon = new IconType();
             plusIcon.setCssClass(GuiStyleConstants.CLASS_ADD_NEW_OBJECT);
             plusIcon.setColor("green");
@@ -297,16 +297,12 @@ protected List<IColumn<SelectableBean<O>, String>> createDefaultColumns() {
 
     private DisplayType getNewObjectButtonStandardDisplayType() {
         if (isCollectionViewPanelForCompiledView()) {
-
             CompiledObjectCollectionView view = getObjectCollectionView();
-            if (ObjectCollectionViewUtil.isArchetypedCollectionView(view)) {
-                return GuiDisplayTypeUtil.getNewObjectDisplayTypeFromCollectionView(view, getPageBase());
-            }
+            return GuiDisplayTypeUtil.getNewObjectDisplayTypeFromCollectionView(view, getPageBase());
          }
 
         String title = getTitleForNewObjectButton();
-        return GuiDisplayTypeUtil.createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green",
-                title);
+        return GuiDisplayTypeUtil.createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green", title);
     }
 
     protected String getTitleForNewObjectButton() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java
@@ -203,4 +203,16 @@ public static <O extends ObjectType> DisplayType getDisplayTypeForObject(O obj,
         return displayType;
     }
 
+    public static boolean existsIconDisplay(CompiledObjectCollectionView view) {
+        if (view == null){
+            return false;
+        }
+        if (view.getDisplay() == null){
+            return false;
+        }
+        if (view.getDisplay().getIcon() == null){
+            return false;
+        }
+        return StringUtils.isNotBlank(view.getDisplay().getIcon().getCssClass());
+    }
 }