Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-11-22 03:47:48 +00:00
Code Issues Actions Projects Releases Wiki Activity

Take Null value for gender into account and fix OnTheFly makeFetch

Browse Source
This commit is contained in:
Julie Lenaerts
2024-10-22 14:39:17 +02:00
parent 30b66d5806
commit 588f02cdf4
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
View File

@@ -103,7 +103,7 @@
{%- endif -%}
{%- elseif person.birthdate is not null -%}
<time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
{{ 'Born the date'|trans({'gender': person.gender.genderTranslation.value,
{{ 'Born the date'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral',
'birthdate': person.birthdate|format_date("medium") }) }}
</time>
{%- if options['addAge'] -%}

6
src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
View File

@@ -45,7 +45,7 @@
<div class="ms-auto">
{% if acp.requestoranonymous == false and acp.requestorPerson is same as(person) %}
<span class="as-requestor badge bg-info" title="{{ 'Requestor'|trans|e('html_attr') }}">
{{ 'Requestor'|trans({'gender': person.gender}) }}
{{ 'Requestor'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
</span>
{% endif %}
@@ -119,7 +119,7 @@
{% endif %}
{% endfor %}
{% if participating %}
{{ 'person.And himself'|trans({'gender': person.gender.genderTranslation.value}) }}
{{ 'person.And himself'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
{% endif %}
</div>
</div>
@@ -131,7 +131,7 @@
<div class="wl-col title">
<h3>
{% if acp.requestorPerson is not null %}
{{ 'Requestor'|trans({'gender': acp.requestorPerson.gender.genderTranslation.value}) }}
{{ 'Requestor'|trans({'gender': acp.requestorPerson.gender ? person.gender.genderTranslation.value : 'neutral'}) }}
{% else %}
{{ 'Requestor'|trans({'gender': 'other'})}}
{% endif %}

7
src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
View File

@@ -73,8 +73,11 @@ This view should receive those arguments:
{% endfor %}
<dt>{{ 'Gender'|trans }}&nbsp;:</dt>
<dd>{{ ( person.gender.label|localize_translatable_string ) }}</dd>
{% if person.gender %}
<dd>{{ ( person.gender.label|localize_translatable_string ) }}</dd>
{% else %}
<dd>{{ 'gender.not defined'|trans }}</dd>
{% endif %}
</dl>
</figure>
</div>