Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'upgrade-sf3' into add_email_and_phone_to_person

Browse Source
This commit is contained in:
Julien Fastré
2018-08-20 11:31:35 +02:00
parent e96da0c641 75e87ac5ba
commit baf4b1f277
17 changed files with 199 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/views/Person/create_review.html.twig
View File

@@ -51,7 +51,7 @@
{% endspaceless %}
</a>
</td>
<td>{{ person.birthdate|localizeddate('long', 'none', app.request.locale) }}</td>
<td>{% if person.birthdate is not null %}{{ person.birthdate|localizeddate('long', 'none', app.request.locale) }}{% else %}&nbsp;{% endif %}</td>
<td>
{% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'Without nationality'|trans }}{% endif %}
</td>

2
Resources/views/Person/list.html.twig
View File

@@ -64,11 +64,13 @@
</table>
<ul class="record_actions">
{% if is_granted('CHILL_PERSON_CREATE') %}
<li>
<a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
{{ 'Add a person'|trans }}
</a>
</li>
{% endif %}
<li>
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
<i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}