From 99f29bd21bee28d71d39fea269d687b02bcfe1fc Mon Sep 17 00:00:00 2001 From: skublik Date: Tue, 6 Nov 2018 10:27:30 +0100 Subject: [PATCH] using summaryTagSimple for resource summary panel --- .../midpoint/web/component/AbstractSummaryPanel.html | 2 +- .../page/admin/resources/ResourceSummaryPanel.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html index ad08cffa89e..c451a736f52 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html @@ -33,7 +33,7 @@ - + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java index 842ceeed65f..f73603d1fbe 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java @@ -28,10 +28,13 @@ import com.evolveum.midpoint.web.component.prism.ObjectWrapper; import com.evolveum.midpoint.web.component.util.ObjectWrapperUtil; import com.evolveum.midpoint.web.component.util.SummaryTag; +import com.evolveum.midpoint.web.component.util.SummaryTagSimple; +import com.evolveum.midpoint.web.model.ContainerableFromPrismObjectModel; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; public class ResourceSummaryPanel extends ObjectSummaryPanel { private static final long serialVersionUID = 1L; @@ -49,20 +52,18 @@ public ResourceSummaryPanel(String id, IModel> model, protected void onBeforeRender() { super.onBeforeRender(); boolean down = ResourceTypeUtil.isDown(model.getObject().asObjectable()); - ObjectWrapper objectWrapper = ObjectWrapperUtil.createObjectWrapper("resourceType", "", model.getObject(), ContainerStatus.MODIFYING, - getPageBase().createSimpleTask("createResourceObjectWrapper"), getPageBase()); - SummaryTag summaryTag = new SummaryTag(ID_UP_DOWN_TAG, new Model(objectWrapper)) { + IModel containerModel = new ContainerableFromPrismObjectModel<>(model); + SummaryTagSimple summaryTag = new SummaryTagSimple(ID_UP_DOWN_TAG, containerModel) { private static final long serialVersionUID = 1L; @Override - protected void initialize(ObjectWrapper wrapper) { + protected void initialize(ResourceType object) { if (!down) { setIconCssClass(GuiStyleConstants.CLASS_ICON_ACTIVATION_ACTIVE); setLabel(getString("ResourceSummaryPanel.UP")); } else { setIconCssClass(GuiStyleConstants.CLASS_ICON_ACTIVATION_INACTIVE); setLabel(getString("ResourceSummaryPanel.DOWN")); - setCssClass(GuiStyleConstants.CLASS_ICON_STYLE_DISABLED); } } };