MID-8658 operational attributes now visible in advanced mode in audit…

… event details view
Evolveum · Mar 30, 2023 · a182cbc · a182cbc
1 parent 5a9c023
commit a182cbc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.java
@@ -65,6 +65,8 @@ public AuditChangesPanel(String id, IModel<ObjectDeltaOperationType> deltaOperat
 
         this.deltaOperationModel = deltaOperationModel;
 
+        setShowOperationalItems(true);
+
         initLayout();
     }
 

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
@@ -890,30 +890,36 @@ private List<VisualizationItemValueImpl> toVisualizationItemValues(Collection<?
     }
 
     private List<VisualizationItemValueImpl> toVisualizationItemValuesRef(Collection<PrismReferenceValue> refValues, VisualizationContext context, Task task, OperationResult result) {
+        if (refValues == null) {
+            return new ArrayList<>();
+        }
+
         List<VisualizationItemValueImpl> rv = new ArrayList<>();
-        if (refValues != null) {
-            for (PrismReferenceValue refValue : refValues) {
-                if (refValue != null) {
-                    refValue = createRefValueWithObject(refValue, context, task, result);
-                    String name;
-                    if (refValue.getObject() != null) {
-                        name = PolyString.getOrig(refValue.getObject().getName());
-                    } else if (refValue.getTargetName() != null) {
-                        name = refValue.getTargetName().getOrig();
-                    } else {
-                        name = refValue.getOid();
-                    }
-                    String relation;
-                    if (refValue.getRelation() != null) {
-                        relation = "[" + refValue.getRelation().getLocalPart() + "]";
-                    } else {
-                        relation = null;
-                    }
-                    VisualizationItemValueImpl itemValue = new VisualizationItemValueImpl(name, relation);
-                    itemValue.setSourceValue(refValue);
-                    rv.add(itemValue);
-                }
+        for (PrismReferenceValue refValue : refValues) {
+            if (refValue == null) {
+                continue;
             }
+
+            refValue = createRefValueWithObject(refValue, context, task, result);
+            String name;
+            if (refValue.getObject() != null) {
+                name = PolyString.getOrig(refValue.getObject().getName());
+            } else if (refValue.getTargetName() != null) {
+                name = refValue.getTargetName().getOrig();
+            } else {
+                name = refValue.getOid();
+            }
+
+            String relation;
+            if (refValue.getRelation() != null) {
+                relation = "[" + refValue.getRelation().getLocalPart() + "]";
+            } else {
+                relation = null;
+            }
+
+            VisualizationItemValueImpl itemValue = new VisualizationItemValueImpl(name, relation);
+            itemValue.setSourceValue(refValue);
+            rv.add(itemValue);
         }
         return rv;
     }