From 722c6ff424f4426196d05a9f4a5c0b1ca5e7ad0f Mon Sep 17 00:00:00 2001 From: Donovan Bourlard <donovan@awkan.fr> Date: Mon, 7 Oct 2019 10:38:02 +0200 Subject: [PATCH] Fix wording of concerned people in treatment word, #208 --- CHANGELOG.md | 4 ++++ .../EventSubscriber/Doctrine/LinkCreatorSubscriber.php | 4 +++- src/Domain/Reporting/Generator/Word/TreatmentGenerator.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 520d73a..21af626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ CHANGELOG ========= ## [UNRELEASED] +### Ajout +- [TECHNIQUE] Mise en place d'outils de qualité de code (PHPMD, PHPStan, csFixer, ...), #188 +### Changement +- [TRAITEMENT] Word / Modification du "Personne référentes" en "Personnes concernées", #208 ## [1.6.1] - 2019-09-23 ### Fix diff --git a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php index 175511f..c8f3824 100644 --- a/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php +++ b/src/Application/Symfony/EventSubscriber/Doctrine/LinkCreatorSubscriber.php @@ -109,7 +109,9 @@ class LinkCreatorSubscriber implements EventSubscriber // We link admin, then check it original token foreach ($token->getRoles() as $role) { if ($role instanceof SwitchUserRole) { - $originalUserId = $role->getSource()->getUser()->getId()->toString(); + /** @var User $originalUser */ + $originalUser = $role->getSource()->getUser(); + $originalUserId = $originalUser->getId()->toString(); $originalUser = $em->find(User::class, $originalUserId); $object->setCreator($originalUser); diff --git a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php index e64d58b..d0bcf2f 100644 --- a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php +++ b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php @@ -239,7 +239,7 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato $detailsData = [ 0 => [ - 'Personnes référentes', + 'Personnes concernées', // Values are added below ], 1 => [ -- GitLab