diff --git a/templates/admin/data_object/data_object/diff_versions.html.twig b/templates/admin/data_object/data_object/diff_versions.html.twig index 390ed2509..39fcae878 100644 --- a/templates/admin/data_object/data_object/diff_versions.html.twig +++ b/templates/admin/data_object/data_object/diff_versions.html.twig @@ -69,6 +69,31 @@ + +   + + + {% set properties1 = object1.getProperties() %} + {% set properties2 = object2.getProperties() %} + {% set allProperties = properties1|merge(properties2) %} + + {% for propertyName, property in allProperties %} + {% set prop1 = properties1[propertyName] ?? null %} + {% set prop2 = properties2[propertyName] ?? null %} + {% set propData1 = prop1 ? prop1.getData() : null %} + {% set propData2 = prop2 ? prop2.getData() : null %} + + + property.{{ propertyName }} + {{ propertyName }} + {% if isImportPreview is not defined or isNew is not defined %} + {{ propData1 }} + {% endif %} + {% set modifiedPropertyClass = propData1 is not same as(propData2) ? 'modified' : '' %} + {{ propData2 }} + + {% endfor %} +   diff --git a/templates/admin/data_object/data_object/preview_version.html.twig b/templates/admin/data_object/data_object/preview_version.html.twig index 3453d3137..39e5b2bad 100644 --- a/templates/admin/data_object/data_object/preview_version.html.twig +++ b/templates/admin/data_object/data_object/preview_version.html.twig @@ -42,6 +42,22 @@   + + {% set properties = object.getProperties() %} + {% for propertyName, property in properties %} + {% set propData = property.getData() %} + + + property.{{ propertyName }} + {{ propertyName }} + {{ propData }} + + {% endfor %} + + +   + + {% for fieldName, definition in fields %} {% if definition is instanceof('\\Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Localizedfields') %} {% for language in validLanguages %}