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

FIX [duplicate][delete] fix error messages for treating the accompaning_period_work linked to the person that will be deleted

Browse Source
This commit is contained in:
Julie Lenaerts 2023-07-12 10:42:46 +02:00
parent 197d69ef4a
commit d825a8509b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
View File

@ -133,9 +133,15 @@ class PersonMove
$conditions = []; $conditions = [];
if (array_key_exists('joinTable', $mapping)) {
foreach ($mapping['joinTable']['joinColumns'] as $columns) {
$conditions[] = sprintf('%s = %d', $columns['referencedColumnName'], $from->getId());
}
} elseif (array_key_exists('joinColumns', $mapping)) {
foreach ($mapping['joinColumns'] as $columns) { foreach ($mapping['joinColumns'] as $columns) {
$conditions[] = sprintf('%s = %d', $columns['name'], $from->getId()); $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
} }
}
return sprintf( return sprintf(
'DELETE FROM %s WHERE %s', 'DELETE FROM %s WHERE %s',

2
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
View File

@ -4,7 +4,7 @@
<li><b>{{ 'gender'|trans }}</b>: <li><b>{{ 'gender'|trans }}</b>:
{{ person.gender|trans }}</li> {{ person.gender|trans }}</li>
<li><b>{{ 'maritalStatus'|trans }}</b>: <li><b>{{ 'maritalStatus'|trans }}</b>:
{% if person.maritalStatus.name %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li> {% if person.maritalStatus %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
<li><b>{{ 'birthdate'|trans }}</b>: <li><b>{{ 'birthdate'|trans }}</b>:
{% if person.birthdate is not null %}{{ person.birthdate|format_date('short') }}{% endif %}</li> {% if person.birthdate is not null %}{{ person.birthdate|format_date('short') }}{% endif %}</li>
<li><b>{{ 'placeOfBirth'|trans }}</b>: <li><b>{{ 'placeOfBirth'|trans }}</b>: