From 19baf54bfbc8f2e96e48e464eea3d4a97540c0a7 Mon Sep 17 00:00:00 2001 From: lskublik Date: Tue, 30 Mar 2021 08:55:27 +0200 Subject: [PATCH] fix for icon of shadow activation (MID-6752) --- .../gui/api/util/WebComponentUtil.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 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 index e286c4c3d1c..91198771984 100644 --- 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: