diff --git a/CHANGELOG.md b/CHANGELOG.md index fd60f7cfb..3c3733d95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to * [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76) * [activity] fix visibility for location +* [person] redirect bug fixed. * [action] add an unrelated issue within action creation. * [origin] fix origin: use correctly the translatable strings * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');` diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php index f5be4793a..de9d1199c 100644 --- a/src/Bundle/ChillMainBundle/Entity/User.php +++ b/src/Bundle/ChillMainBundle/Entity/User.php @@ -186,7 +186,7 @@ class User implements AdvancedUserInterface /** * @return string */ - public function getEmail() + public function getEmail(): ?string { return $this->email; } diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index 6247b92bb..1b79ba867 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -222,9 +222,7 @@ final class PersonController extends AbstractController 'label' => 'Add the person', ])->add('createPeriod', SubmitType::class, [ 'label' => 'Add the person and create an accompanying period', - ])->add('createHousehold', SubmitType::class, [ - 'label' => 'Add the person and create an household', - ]); // TODO createHousehold form action + ]); $form->handleRequest($request); diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig index 799d71e19..857e33abe 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig @@ -83,7 +83,7 @@ @@ -106,5 +103,5 @@ {% endblock content %} {% block js %} - {{ encore_entry_script_tags('mod_disablebuttons') }} + {# {{ encore_entry_script_tags('mod_disablebuttons') }} #} {% endblock js %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index a37ee0f4e..4a712633d 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -124,8 +124,8 @@ address_country_code: Code pays 'Alreay existing person': 'Dossiers déjà encodés' 'Add the person': 'Ajouter la personne' -'Add the person and create an accompanying period': "Créer la personne ET créer une période d'accompagnement" -'Add the person and create an household': "Créer la personne ET créer un ménage" +'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement" +'Add the person and create an household': "Créer la personne & créer un ménage" Show person: Voir le dossier de la personne 'Confirm the creation': 'Confirmer la création' 'You will create this person': 'Vous allez créer le dossier suivant' diff --git a/tests/app b/tests/app index bd95d3c96..5952eda44 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01 +Subproject commit 5952eda44831896991989c2e4881adc26329140e