Merge branch 'issue381_address_in_location' into 'master'

address in location

See merge request Chill-Projet/chill-bundles!289

CHANGELOG.md

@@ -11,7 +11,15 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+
+* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
+* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
 * [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+## Test releases
+
+### test release 2022-01-10
 
 * [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
 * [main] Add mainLocation field to User entity and add it in user form type
@@ -21,9 +29,6 @@ and this project adheres to
 * [accompanying period work] remove the possibility to  generate document from an accompanying period work
 * vuejs: add validation on required fields for AddPerson, Address and Location components
 * vuejs: treat 422 validation errors in locations and AddPerson components
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
-
-## Test releases
 
 ### test release 2022-01-12
 

src/Bundle/ChillMainBundle/Form/LocationFormType.php

@@ -54,7 +54,6 @@ final class LocationFormType extends AbstractType
                 'label' => 'Address',
                 'use_valid_from' => false,
                 'use_valid_to' => false,
-                'mapped' => false,
             ])
             ->add(
                 'active',

src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig

@@ -23,7 +23,7 @@
 					<td>{{ entity.email }}</td>
 					<td>
 					{% if entity.address is not null %}
-					    {{ entity.address.street}}, {{ entity.address.streetnumber }}
+					    {{ entity.address| chill_entity_render_box }}
 					{% endif %}
 					</td>
 					<td style="text-align:center;">

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig

@@ -50,7 +50,7 @@
 
                     <dt>{{ 'thirdparty.Categories'|trans }}</dt>
                     {% set types = [] %}
-                    {% for t in thirdParty.types %}
+                    {% for t in thirdParty.thirdPartyTypes %}
                         {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %}
                     {% endfor %}
                     {% for c in thirdParty.categories %}