From 9fa429c433cb9d4f4a0dc4a556edb0cdb9fc97c9 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Mon, 25 Mar 2024 11:18:41 +0100 Subject: [PATCH 1/3] #1043: Template placeholder convenience --- src/Service/MailTemplateHelper.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Service/MailTemplateHelper.php b/src/Service/MailTemplateHelper.php index fd2b270f..22b3e45c 100644 --- a/src/Service/MailTemplateHelper.php +++ b/src/Service/MailTemplateHelper.php @@ -377,6 +377,9 @@ private function getValues(?object $entity, TemplateProcessor $templateProcessor $relationData = json_decode($this->serializer->serialize($relation, 'json', ['groups' => ['mail_template']]), true); $data += ['relation' => $relationData]; + + // For convenience, we add the same relation data with relevant prefix to help users. + $data['recipient'] += $relationData; } elseif ($entity instanceof AgendaBroadcast) { $data += json_decode($this->serializer->serialize($entity->getAgenda(), 'json', ['groups' => ['mail_template']]), true); } From 0de89f4adf1bde28fe269ae9f7b242d3aac3f71c Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Mon, 25 Mar 2024 11:25:29 +0100 Subject: [PATCH 2/3] #1043: Updated CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef4a692f..a0a8e8e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ about writing changes to this log. ## [Unreleased] +- [PR-384](https://github.com/itk-dev/naevnssekretariatet/pull/384) + Added template placeholder relation data to recipient + prefix when creating hearing briefings. + ## [1.5.3] - 2023-12-19 - [PR-377](https://github.com/itk-dev/naevnssekretariatet/pull/377) From 4d96ba5e7193bb3fc1762392dbd83e94efeef4c9 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 3 Apr 2024 10:47:03 +0200 Subject: [PATCH 3/3] Release 1.5.4 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0a8e8e6..d4c05826 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ about writing changes to this log. ## [Unreleased] +## [1.5.4] - 2024-04-03 + - [PR-384](https://github.com/itk-dev/naevnssekretariatet/pull/384) Added template placeholder relation data to recipient prefix when creating hearing briefings. @@ -302,7 +304,8 @@ Fixed error in unescaped characters in filename - [TVIST1-604](https://jira.itkdev.dk/browse/TVIST1-604): Resolved issue regarding time formats. -[Unreleased]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.3...HEAD +[Unreleased]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.4...HEAD +[1.5.4]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.3...1.5.4 [1.5.3]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.2...1.5.3 [1.5.2]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.1...1.5.2 [1.5.1]: https://github.com/itk-dev/naevnssekretariatet/compare/1.5.0...1.5.1