fix for icon of shadow activation (MID-6752)

Evolveum · Mar 30, 2021 · 19baf54 · 19baf54
1 parent 7565a92
commit 19baf54
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -3808,10 +3808,24 @@ public static CompositedIcon createAccountIcon(ShadowType shadow, PageBase pageB
             return builder.build();
         }
 
+        if (shadow.getResourceRef() != null && shadow.getResourceRef().getObject() != null
+                && !ResourceTypeUtil.isActivationCapabilityEnabled((ResourceType)shadow.getResourceRef().getObject().asObjectable(), null)) {
+            IconType icon = new IconType();
+            icon.setCssClass("fa fa-ban " + GuiStyleConstants.RED_COLOR);
+            if (isColumn) {
+                builder.appendLayerIcon(icon, IconCssStyle.BOTTOM_RIGHT_FOR_COLUMN_STYLE);
+            } else {
+                builder.appendLayerIcon(icon, IconCssStyle.BOTTOM_RIGHT_STYLE);
+            }
+            builder.setTitle(pageBase.createStringResource("accountIcon.activation.notSupported").getString()
+                    + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
+            return builder.build();
+        }
+
         ActivationType activation = shadow.getActivation();
         if (activation == null) {
-            builder.setTitle(pageBase.createStringResource("ActivationStatusType.null").getString()
-                    + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
+            builder.setTitle(pageBase.createStringResource("accountIcon.activation.unknown").getString()
+                        + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
             appendUndefinedIcon(builder);
             return builder.build();
         }
@@ -3832,12 +3846,14 @@ public static CompositedIcon createAccountIcon(ShadowType shadow, PageBase pageB
         }
 
         ActivationStatusType value = activation.getAdministrativeStatus();
-        builder.setTitle(pageBase.createStringResource("ActivationStatusType." + value).getString()
-                + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
         if (value == null) {
+            builder.setTitle(pageBase.createStringResource("accountIcon.activation.unknown").getString()
+                    + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
             appendUndefinedIcon(builder);
             return builder.build();
         }
+        builder.setTitle(pageBase.createStringResource("ActivationStatusType." + value).getString()
+                + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
 
         switch (value) {
             case DISABLED: