diff --git a/CHANGELOG.md b/CHANGELOG.md index e98d70eb6..b8003b4a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,13 @@ and this project adheres to * [person] show number of children + allow set number of children to null (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191) * [person] show acceptSMS option (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191) * [person] add death information in person render box in twig and vue render boxes (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191) +* [badge-entity] design coherency between pills badge-person and 3 kinds of badge-thirdparty +* [AddPersons] suggestions row are clickable, not only checkbox +* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl +* [badges] create specific badge for TMS, and make person/thirdparty badges clickable with on-the-fly modal in : + * concerned groups items (activity, calendar) + * accompanyingCourseWork lists + * accompanyingCourse lists ## Test releases @@ -46,13 +53,6 @@ and this project adheres to * [visgraph] improve and fix bugs on vis-network relationship graph * [bugfix] posting of birth- and deathdate through api fixed. * [suggestions] improve suggestions lists -* [badge-entity] design coherency between pills badge-person and 3 kinds of badge-thirdparty -* [AddPersons] suggestions row are clickable, not only checkbox -* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl -* [badges] create specific badge for TMS, and make person/thirdparty badges clickable with on-the-fly modal in : - * concerned groups items (activity, calendar) - * accompanyingCourseWork lists - * accompanyingCourse lists ### Test release 2021-11-19 - bis diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php index 069dba9d8..9697873e9 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php @@ -35,6 +35,7 @@ use function array_values; use function in_array; use function is_string; use function spl_object_hash; +use Symfony\Component\Serializer\Annotation\SerializedName; /** * ThirdParty is a party recorded in the database. @@ -221,6 +222,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface /** * @var array|null * @ORM\Column(name="types", type="json", nullable=true) + * @serializedName("3partyTypes") */ private $types;