mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Add notification date to entity render strings
The notification date has been added to the render strings of entities involved in the notifications, specifically for the sender, addressees, and normalizer. This is done by passing it as a parameter to the 'chill_entity_render_string' function and the 'normalize' function in NotificationNormalizer. This will help provide more context regarding the time of the events in the notification.
This commit is contained in:
parent
be730679c8
commit
f43d79c940
@ -21,7 +21,7 @@
|
|||||||
</span>
|
</span>
|
||||||
{% if not c.notification.isSystem %}
|
{% if not c.notification.isSystem %}
|
||||||
<span class="badge-user">
|
<span class="badge-user">
|
||||||
{{ c.notification.sender|chill_entity_render_string }}
|
{{ c.notification.sender|chill_entity_render_string({'at_date': c.notification.date}) }}
|
||||||
</span>
|
</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="badge-user system">{{ 'notification.is_system'|trans }}</span>
|
<span class="badge-user system">{{ 'notification.is_system'|trans }}</span>
|
||||||
@ -53,7 +53,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% for a in c.notification.addressees %}
|
{% for a in c.notification.addressees %}
|
||||||
<span class="badge-user">
|
<span class="badge-user">
|
||||||
{{ a|chill_entity_render_string }}
|
{{ a|chill_entity_render_string({'at_date': c.notification.date}) }}
|
||||||
</span>
|
</span>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% for a in c.notification.addressesEmails %}
|
{% for a in c.notification.addressesEmails %}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% extends "@ChillMain/layout.html.twig" %}
|
{% extends "@ChillMain/layout.html.twig" %}
|
||||||
|
|
||||||
{% block title 'notification.show notification from %sender%'|trans(
|
{% block title 'notification.show notification from %sender%'|trans(
|
||||||
{ '%sender%': notification.sender|chill_entity_render_string }
|
{ '%sender%': notification.sender|chill_entity_render_string({'at_date': notification.date}) }
|
||||||
) ~ ' ' ~ notification.title %}
|
) ~ ' ' ~ notification.title %}
|
||||||
|
|
||||||
{% block js %}
|
{% block js %}
|
||||||
|
@ -47,7 +47,7 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
'message' => $object->getMessage(),
|
'message' => $object->getMessage(),
|
||||||
'relatedEntityClass' => $object->getRelatedEntityClass(),
|
'relatedEntityClass' => $object->getRelatedEntityClass(),
|
||||||
'relatedEntityId' => $object->getRelatedEntityId(),
|
'relatedEntityId' => $object->getRelatedEntityId(),
|
||||||
'sender' => $this->normalizer->normalize($object->getSender(), $format, $context),
|
'sender' => $this->normalizer->normalize($object->getSender(), $format, [...$context, UserNormalizer::AT_DATE => $object->getDate()]),
|
||||||
'title' => $object->getTitle(),
|
'title' => $object->getTitle(),
|
||||||
'entity' => null !== $entity ? $this->normalizer->normalize($entity, $format, $context) : null,
|
'entity' => null !== $entity ? $this->normalizer->normalize($entity, $format, $context) : null,
|
||||||
];
|
];
|
||||||
|
@ -14,7 +14,7 @@ namespace Chill\MainBundle\Templating\Entity;
|
|||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Monolog\DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Symfony\Component\Clock\ClockInterface;
|
use Symfony\Component\Clock\ClockInterface;
|
||||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use Twig\Error\LoaderError;
|
use Twig\Error\LoaderError;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user