From 2c3818258a3a2b233696c7840492b54f473e923f Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 31 Oct 2024 12:13:21 +0100 Subject: [PATCH] Fix fusion of person doubles and add changies for fixes --- .changes/unreleased/Fixed-20241031-121123.yaml | 5 +++++ .changes/unreleased/Fixed-20241031-121212.yaml | 6 ++++++ src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .changes/unreleased/Fixed-20241031-121123.yaml create mode 100644 .changes/unreleased/Fixed-20241031-121212.yaml diff --git a/.changes/unreleased/Fixed-20241031-121123.yaml b/.changes/unreleased/Fixed-20241031-121123.yaml new file mode 100644 index 000000000..21d407240 --- /dev/null +++ b/.changes/unreleased/Fixed-20241031-121123.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Add the possibility of unknown to the gender entity +time: 2024-10-31T12:11:23.734888589+01:00 +custom: + Issue: "" diff --git a/.changes/unreleased/Fixed-20241031-121212.yaml b/.changes/unreleased/Fixed-20241031-121212.yaml new file mode 100644 index 000000000..eac6a4e77 --- /dev/null +++ b/.changes/unreleased/Fixed-20241031-121212.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: Fix the fusion of person doubles by excluding accompanyingPeriod work entities + to be deleted. They are moved instead. +time: 2024-10-31T12:12:12.572142413+01:00 +custom: + Issue: "" diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php index 2ebae0457..a70f515f2 100644 --- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php +++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php @@ -201,7 +201,7 @@ class PersonMove private function getDeleteEntities(): array { return [ - AccompanyingPeriod\AccompanyingPeriodWork::class, +// AccompanyingPeriod\AccompanyingPeriodWork::class, Relationship::class, ]; } @@ -216,7 +216,7 @@ class PersonMove } /** - * get the full table name with schema if it does exists. + * get the full table name with schema if it exists. */ private function getTableName(ClassMetadata $metadata): string {