diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/VisualizationDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/VisualizationDto.java index f0dbf3de681..4778bbfd029 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/VisualizationDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/VisualizationDto.java @@ -14,6 +14,8 @@ import java.util.List; import java.util.Objects; +import com.evolveum.midpoint.prism.polystring.PolyString; + import org.jetbrains.annotations.NotNull; import com.evolveum.midpoint.gui.api.page.PageBase; @@ -36,6 +38,8 @@ public class VisualizationDto implements Serializable { private String boxClassOverride; + private PolyString nameOverwrite; + private final List items = new ArrayList<>(); private final List partialVisualizations = new ArrayList<>(); @@ -65,6 +69,10 @@ public void setMinimized(boolean minimized) { this.minimized = minimized; } + public void setNameOverwrite(PolyString nameOverwrite) { + this.nameOverwrite = nameOverwrite; + } + public List getPartialVisualizations() { return partialVisualizations; } @@ -86,6 +94,10 @@ public List getItems() { } public String getName() { + if (nameOverwrite != null) { + return LocalizationUtil.translatePolyString(nameOverwrite); + } + Name nameObject = visualization.getName(); if (nameObject == null) { return LocalizationUtil.translate("SceneDto.unnamed"); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java index 8074732d1b5..edd27db5b2f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java @@ -10,6 +10,8 @@ import java.util.Collections; import java.util.List; +import com.evolveum.midpoint.prism.delta.ChangeType; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -201,7 +203,15 @@ private List loadVisualizationForDelta() throws SchemaExceptio throw e; } - return Collections.singletonList(new VisualizationDto(visualization)); + ObjectDeltaOperationType deltaOperation = model.getObject(); + + VisualizationDto dto = new VisualizationDto(visualization); + + if (deltaOperation.getObjectName() != null && ChangeType.DELETE == dto.getChangeType()) { + dto.setNameOverwrite(deltaOperation.getObjectName().toPolyString()); + } + + return Collections.singletonList(dto); } } }