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

2025-06-20 09:14:23 +00:00 · 2014-11-19 09:44:08 +01:00 · 2014-11-19 09:44:08 +01:00 · 51115b6f36
commit 51115b6f36
parent 87b4cb65e4 beafcd902e
2 changed files with 3 additions and 2 deletions
--- a/Resources/config/doctrine/Person.orm.yml
+++ b/Resources/config/doctrine/Person.orm.yml
@ -37,7 +37,8 @@ Chill\PersonBundle\Entity\Person:
        cFData:
            type: array
        phonenumber:
-            type:text
+            type: text
+            nullable: true
    manyToOne:
        countryOfBirth:
            targetEntity: Chill\MainBundle\Entity\Country
--- a/Resources/views/Person/list.html.twig
+++ b/Resources/views/Person/list.html.twig
@ -44,7 +44,7 @@
                    </td>
                    <td>
                        {% if person.nationality is not null %}
-                            <span class="personNationality">{{person.nationality.label}}</span>
+                            <span class="personNationality">{{person.nationality.name | localize_translatable_string }}</span>
                        {% else %}
                            {{ 'Without nationality'|trans }}
                        {% endif %}