+ {% trans %}log.element_created.original_instock{% endtrans %}: + {{ entry.creationInstockValue }} +
+{% endif %} \ No newline at end of file diff --git a/templates/log_system/details/_extra_element_deleted.html.twig b/templates/log_system/details/_extra_element_deleted.html.twig new file mode 100644 index 00000000..ceb9e9e2 --- /dev/null +++ b/templates/log_system/details/_extra_element_deleted.html.twig @@ -0,0 +1,8 @@ +{# @var entry \App\Entity\LogSystem\ElementDeletedLogEntry #} + +{% import "log_system/details/helper.macro.html.twig" as log_helper %} + + + +{{ log_helper.comment_field(entry) }} +{{ log_helper.data_change_table(entry) }} \ No newline at end of file diff --git a/templates/log_system/details/_extra_element_edited.html.twig b/templates/log_system/details/_extra_element_edited.html.twig new file mode 100644 index 00000000..f0c2bc75 --- /dev/null +++ b/templates/log_system/details/_extra_element_edited.html.twig @@ -0,0 +1,11 @@ +{# @var entry \App\Entity\LogSystem\ElementDeletedLogEntry #} + +{% import "log_system/details/helper.macro.html.twig" as log_helper %} + +{% if entry.undoEvent %} + Test +{% endif %} + +{{ log_helper.comment_field(entry) }} + +{{ log_helper.data_change_table(entry) }} diff --git a/templates/log_system/details/_extra_security_event.html.twig b/templates/log_system/details/_extra_security_event.html.twig new file mode 100644 index 00000000..fa023db6 --- /dev/null +++ b/templates/log_system/details/_extra_security_event.html.twig @@ -0,0 +1,9 @@ +{# @var entry \App\Entity\LogSystem\UserLoginLogEntry #} + +IP: + + + {{ entry.iPAddress }} + + +{% trans %}log.user_login.ip_anonymize_hint{% endtrans %}
\ No newline at end of file diff --git a/templates/log_system/details/_extra_user_login.html.twig b/templates/log_system/details/_extra_user_login.html.twig new file mode 100644 index 00000000..4c7e8680 --- /dev/null +++ b/templates/log_system/details/_extra_user_login.html.twig @@ -0,0 +1,9 @@ +{# @var entry \App\Entity\LogSystem\UserLoginLogEntry #} + +{% trans %}log.user_login.login_from_ip{% endtrans %}: + + + {{ entry.iPAddress }} + + +{% trans %}log.user_login.ip_anonymize_hint{% endtrans %}
\ No newline at end of file diff --git a/templates/log_system/details/_extra_user_not_allowed.html.twig b/templates/log_system/details/_extra_user_not_allowed.html.twig new file mode 100644 index 00000000..43ab1500 --- /dev/null +++ b/templates/log_system/details/_extra_user_not_allowed.html.twig @@ -0,0 +1,4 @@ +{# @var entry \App\Entity\LogSystem\UserNotAllowedLogEntry #} + +{% trans %}log.user_not_allowed.unauthorized_access_attempt_to{% endtrans %}:{{ entry.path }}
+{% trans %}log.user_not_allowed.hint{% endtrans %}
\ 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 new file mode 100644 index 00000000..cc6fedd6 --- /dev/null +++ b/templates/log_system/details/helper.macro.html.twig @@ -0,0 +1,140 @@ +{% macro undo_buttons(entry, target_element) %} + {# @var entry \App\Entity\LogSystem\ElementEditedLogEntry|\App\Entity\LogSystem\ElementDeletedLogEntry entry #} + {% set disabled = not is_granted('revert_element', entry.targetClass) %} + + {% if entry is instanceof('App\\Entity\\LogSystem\\CollectionElementDeleted') + or (entry is instanceof('App\\Entity\\LogSystem\\ElementDeletedLogEntry') and entry.hasOldDataInformation) %} + + {% set icon = 'fa-trash-restore' %} + {% set title = 'log.undo.undelete'|trans %} + {% set title_short = 'log.undo.undelete.short'|trans %} + + {% elseif entry is instanceof('App\\Entity\\LogSystem\\ElementCreatedLogEntry') + or (entry is instanceof('App\\Entity\\LogSystem\\ElementEditedLogEntry') and entry.hasOldDataInformation) %} + + {% set icon = 'fa-undo' %} + {% set title = 'log.undo.undo'|trans %} + {% set title_short = 'log.undo.undo.short'|trans %} + {% endif %} + + +{% endmacro %} + + +{% macro comment_field(entry) %} + {# @var entry \App\Entity\Contracts\LogWithComment #} ++ {% trans %}edit.log_comment{% endtrans %}: + {% if entry.comment %} + {{ entry.comment }} + {% else %} + {% trans %}log.no_comment{% endtrans %} + {% endif %} +
+{% endmacro %} + +{% macro data_change_table(entry) %} + {# @var entry \App\Entity\LogSystem\ElementEditedLogEntry|\App\Entity\LogSystem\ElementDeletedLogEntry entry #} + + {% set fields, old_data, new_data = {}, {}, {} %} + + {# For log entries where only the changed fields are saved, this is the last executed assignment #} + {% if attribute(entry, 'changedFieldInfo') is defined and entry.changedFieldsInfo %} + {% set fields = entry.changedFields %} + {% endif %} + + {# For log entries, where we know the old data, this is the last exectuted assignment #} + {% if attribute(entry, 'oldDataInformation') is defined and entry.oldDataInformation %} + {# We have to use the keys of oldData here, as changedFields might not be available #} + {% set fields = entry.oldData | keys %} + {% set old_data = entry.oldData %} + {% endif %} + + {# For log entries, where we have new data, we define it #} + {% if attribute(entry, 'newDataInformation') is defined and entry.newDataInformation %} + {# We have to use the keys of oldData here, as changedFields might not be available #} + {% set fields = entry.newData | keys %} + {% set new_data = entry.newData %} + {% endif %} + + {% if fields is not empty %} +| {% trans %}log.element_changed.field{% endtrans %} | + {% if old_data is not empty %} +{% trans %}log.element_changed.data_before{% endtrans %} | + {% endif %} + {% if new_data is not empty %} +{% trans %}log.element_changed.data_after{% endtrans %} | + {% endif %} + {% if new_data is not empty and old_data is not empty %} {# Diff column #} +{% trans %}log.element_changed.diff{% endtrans %} | + {% endif %} +
|---|---|---|---|
| + {% 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 }} + ({{ field }}) + {% else %} + {{ field }} + {% endif %} + + | + {% if old_data is not empty %} ++ {% if old_data[field] is defined %} + {{ format_log_data(old_data[field], entry, field) }} + {% endif %} + | + {% endif %} + {% if new_data is not empty %} ++ {% if new_data[field] is defined %} + {{ format_log_data(new_data[field], entry, field) }} + {% endif %} + | + {% endif %} + + {% if new_data is not empty and old_data is not empty %} ++ {% if new_data[field] is defined and old_data[field] is defined %} + {{ format_log_diff(old_data[field], new_data[field]) }} + {% endif %} + | + {% endif %} +
| {% trans %}log.timestamp{% endtrans %} | +{{ log_entry.timestamp | format_datetime('full') }} | +
| {% trans %}log.type{% endtrans %} | ++ {{ ('log.type.' ~ log_entry.type) | trans }} + {% if log_entry.type == 'part_stock_changed' %} + ({{ ('log.part_stock_changed.' ~ log_entry.instockChangeType)|trans }}) + {% endif %} + + {% if log_entry is instanceof('App\\Entity\\Contracts\\LogWithEventUndoInterface') and log_entry.undoEvent %} + ({{ ('log.undo_mode.' ~ log_entry.undoMode)|trans }}: #{{ log_entry.UndoEventID }}) + {% endif %} + | +
| {% trans %}log.level{% endtrans %} | ++ + {{ ('log.level.'~ log_entry.levelString)|trans }} + | +
| {% trans %}log.user{% endtrans %} + | + {% if log_entry.cLIEntry %} + + {{ log_entry.cLIUsername }} ({% trans %}log.cli_user{% endtrans %}) + {% else %} + {% if log_entry.user %} + {{ helper.user_icon_link(log_entry.user) }} (@{{ log_entry.user.username }}) + {% else %} + @{{ log_entry.username }} ({% trans %}log.target_deleted{% endtrans %} + {% endif %} + {% endif %} + | +
| {% trans %}log.target{% endtrans %} | +{{ target_html|raw }} | +