From 8bb8257e627eef0e77523980a6734cfa4e4cc098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Thu, 18 May 2023 23:05:40 +0200
Subject: [PATCH] Added a log entry detail page for collection element deleted
 log entries.

---
 ...extra_collection_element_deleted.html.twig | 15 +++++++++++++
 .../log_system/details/helper.macro.html.twig | 21 +++++++++++--------
 .../log_system/details/log_details.html.twig  |  2 ++
 translations/messages.en.xlf                  | 12 +++++++++++
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 templates/log_system/details/_extra_collection_element_deleted.html.twig

diff --git a/templates/log_system/details/_extra_collection_element_deleted.html.twig b/templates/log_system/details/_extra_collection_element_deleted.html.twig
new file mode 100644
index 00000000..221fae95
--- /dev/null
+++ b/templates/log_system/details/_extra_collection_element_deleted.html.twig
@@ -0,0 +1,15 @@
+{# @var entry \App\Entity\LogSystem\CollectionElementDeleted #}
+
+{% import "log_system/details/helper.macro.html.twig" as log_helper %}
+
+<p class="m-0">
+    <b>{% trans %}log.collection_deleted.deleted{% endtrans %}</b>:
+    {{ entity_type_label(entry.deletedElementClass) }} #{{ entry.deletedElementID }}
+    {% if entry.oldName is not empty %}
+        ({{ entry.oldName }})
+    {% endif %}
+</p>
+<p class="m-0">
+    <b>{% trans %}log.collection_deleted.on_collection{% endtrans %}</b>:
+    {{ log_helper.translate_field(entry.collectionName) }}
+</p>
\ No newline at end of file
diff --git a/templates/log_system/details/helper.macro.html.twig b/templates/log_system/details/helper.macro.html.twig
index cc6fedd6..fec32ba2 100644
--- a/templates/log_system/details/helper.macro.html.twig
+++ b/templates/log_system/details/helper.macro.html.twig
@@ -56,6 +56,17 @@
     </p>
 {% endmacro %}
 
+{% macro translate_field(field) %}
+    {% set trans_key = 'log.element_edited.changed_fields.'~field %}
+    {# If the translation key is not found, the translation key is returned, and we dont show the translation #}
+    {% if trans_key|trans != trans_key %}
+        {{ ('log.element_edited.changed_fields.'~field) | trans }}
+        <span class="text-muted">({{ field }})</span>
+    {% else %}
+        {{ field }}
+    {% endif %}
+{% endmacro %}
+
 {% macro data_change_table(entry) %}
     {# @var entry \App\Entity\LogSystem\ElementEditedLogEntry|\App\Entity\LogSystem\ElementDeletedLogEntry entry #}
 
@@ -100,15 +111,7 @@
             {% for field in fields %}
                 <tr>
                     <td title="{{ field }}">
-                        {% set trans_key = 'log.element_edited.changed_fields.'~field %}
-                        {# If the translation key is not found, the translation key is returned, and we dont show the translation #}
-                        {% if trans_key|trans != trans_key %}
-                            {{ ('log.element_edited.changed_fields.'~field) | trans }}
-                            <span class="text-muted">({{ field }})</span>
-                        {% else %}
-                            {{ field }}
-                        {% endif %}
-
+                        {{ _self.translate_field(field) }}
                     </td>
                     {% if old_data is not empty %}
                         <td>
diff --git a/templates/log_system/details/log_details.html.twig b/templates/log_system/details/log_details.html.twig
index 2cd8a968..6dedd8ee 100644
--- a/templates/log_system/details/log_details.html.twig
+++ b/templates/log_system/details/log_details.html.twig
@@ -108,6 +108,8 @@
             {% include "log_system/details/_extra_user_not_allowed.html.twig" %}
         {% elseif log_entry is instanceof('App\\Entity\\LogSystem\\SecurityEventLogEntry') %}
             {% include "log_system/details/_extra_security_event.html.twig" %}
+        {%  elseif log_entry is instanceof('App\\Entity\\LogSystem\\CollectionElementDeleted') %}
+                {% include "log_system/details/_extra_collection_element_deleted.html.twig" %}
         {% else %}
             {{ extra_html | raw }}
         {% endif %}
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index ce14496e..fee0a412 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -11421,5 +11421,17 @@ Element 3</target>
         <target>If this is an element history entry, this breaks the element history! This can lead to unexpected results when using the time travel function.</target>
       </segment>
     </unit>
+    <unit id="P.c4WmY" name="log.collection_deleted.on_collection">
+      <segment>
+        <source>log.collection_deleted.on_collection</source>
+        <target>on Collection</target>
+      </segment>
+    </unit>
+    <unit id=".wiLJk6" name="log.element_edited.changed_fields.attachments">
+      <segment>
+        <source>log.element_edited.changed_fields.attachments</source>
+        <target>Attachments</target>
+      </segment>
+    </unit>
   </file>
 </xliff>