Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'issue320_bug_redirect_createPeriod' into 'master'

Browse Source 
Issue320 bug redirect create period

See merge request Chill-Projet/chill-bundles!249
This commit is contained in:
Julien Fastré 2021-12-12 14:12:44 +00:00
commit 133ac67794
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ and this project adheres to
<!-- write down unreleased development here -->
* [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');`

2
src/Bundle/ChillMainBundle/Entity/User.php
View File

@ -186,7 +186,7 @@ class User implements AdvancedUserInterface
/**
* @return string
*/
public function getEmail()
public function getEmail(): ?string
{
return $this->email;
}

4
src/Bundle/ChillPersonBundle/Controller/PersonController.php
View File

@ -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);

9
src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
View File

@ -83,7 +83,7 @@
<ul class="record_actions sticky-form-buttons">
<li class="dropdown">
<a class="btn btn-create dropdown-toggle"
href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
{{ 'Add the person'|trans }}
</a>
<ul class="dropdown-menu" aria-labelledby="newPersonMore">
@ -93,10 +93,7 @@
<li>
{{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
</li>
<li>
{{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
</li>
</ul>
</ul>
</li>
</ul>
@ -106,5 +103,5 @@
{% endblock content %}
{% block js %}
{{ encore_entry_script_tags('mod_disablebuttons') }}
{# {{ encore_entry_script_tags('mod_disablebuttons') }} #}
{% endblock js %}

4
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -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'

2
tests/app

@ -1 +1 @@
Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01
Subproject commit 5952eda44831896991989c2e4881adc26329140e