Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2026-03-18 11:48:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'fix/fix-link-notification-email' into 'master'

Browse Source 
Fix notification email links to handle user and non-user contexts

See merge request Chill-Projet/chill-bundles!973
This commit is contained in:
Julien Fastré
2026-03-18 08:16:41 +00:00
parent 9ba8ec8f41 f12bc2f35f
commit b5a22508ff
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.changes/unreleased/Fixed-20260318-090323.yaml Normal file
View File

@@ -0,0 +1,7 @@
kind: Fixed
body: Fix link inside notification email
time: 2026-03-18T09:03:23.896160821+01:00
custom:
Issue: ""
MR: ""
SchemaChange: No schema change

3
src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
View File

@@ -101,6 +101,9 @@ class NotificationMailer
if (null === $addressee->getEmail()) {
continue;
}
if ($notification->getSender() === $addressee) {
continue;
}
$this->processNotificationForAddressee($notification, $addressee);
}
}

5
src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.md.twig
View File

@@ -13,7 +13,12 @@
> {{ line }}
{% endfor %}
{% if dest.isUser %}
[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }})
{% else %}
[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_grant_access_by_access_key', {'_locale': dest.locale, 'id': notification.id, 'accessKey': notification.accessKey }, false)) }})
{% endif %}
-----

6
src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.txt.twig
View File

@@ -12,7 +12,11 @@ Titre de la notification: {{ notification.title }}
> {{ line|raw }}
{% endfor %}
Vous pouvez visualiser la notification et y répondre ici: {{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }}.
{% if dest.isUser %}
[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }})
{% else %}
[Vous pouvez visualiser la notification et y répondre ici.]({{ absolute_url(path('chill_main_notification_grant_access_by_access_key', {'_locale': dest.locale, 'id': notification.id, 'accessKey': notification.accessKey }, false)) }})
{% endif %}
--
Le logiciel Chill