Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions templates/admin/data_object/data_object/diff_versions.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,31 @@
</tr>


<tr class="">
<td colspan="3">&nbsp;</td>
</tr>

{% 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 %}

<tr {% if loop.index is odd %}class="odd"{% endif %}>
<td>property.{{ propertyName }}</td>
<td>{{ propertyName }}</td>
{% if isImportPreview is not defined or isNew is not defined %}
<td>{{ propData1 }}</td>
{% endif %}
{% set modifiedPropertyClass = propData1 is not same as(propData2) ? 'modified' : '' %}
<td class="{{ modifiedPropertyClass }}">{{ propData2 }}</td>
</tr>
{% endfor %}

<tr class="">
<td colspan="3">&nbsp;</td>
</tr>
Expand Down
16 changes: 16 additions & 0 deletions templates/admin/data_object/data_object/preview_version.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@
<tr class="">
<td colspan="3">&nbsp;</td>
</tr>

{% set properties = object.getProperties() %}
{% for propertyName, property in properties %}
{% set propData = property.getData() %}

<tr {% if loop.index is odd %}class="odd"{% endif %}>
<td>property.{{ propertyName }}</td>
<td>{{ propertyName }}</td>
<td>{{ propData }}</td>
</tr>
{% endfor %}

<tr class="">
<td colspan="3">&nbsp;</td>
</tr>

{% for fieldName, definition in fields %}
{% if definition is instanceof('\\Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Localizedfields') %}
{% for language in validLanguages %}
Expand Down
Loading