Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-20 09:14:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Chill-project/Person

Browse Source
This commit is contained in:
Marc Ducobu 2014-11-19 09:44:08 +01:00
commit 51115b6f36
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/config/doctrine/Person.orm.yml
View File

@ -37,7 +37,8 @@ Chill\PersonBundle\Entity\Person:
cFData: cFData:
type: array type: array
phonenumber: phonenumber:
type:text type: text
nullable: true
manyToOne: manyToOne:
countryOfBirth: countryOfBirth:
targetEntity: Chill\MainBundle\Entity\Country targetEntity: Chill\MainBundle\Entity\Country

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

@ -44,7 +44,7 @@
</td> </td>
<td> <td>
{% if person.nationality is not null %} {% if person.nationality is not null %}
<span class="personNationality">{{person.nationality.label}}</span> <span class="personNationality">{{person.nationality.name | localize_translatable_string }}</span>
{% else %} {% else %}
{{ 'Without nationality'|trans }} {{ 'Without nationality'|trans }}
{% endif %} {% endif %}