Person email when activity and team only

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index cb51d4c209e3a647a642d0a9db840a45c4d6f95a..b81c4170a164c6ef9dd7ad95b08392f42dbc09f4 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -445,7 +445,7 @@ class PersonActivity(Period):
     class Meta:
         verbose_name = _('activity')
         verbose_name_plural = _('activities')
-        ordering = ['person__last_name',]
+        ordering = ['-date_from',]
 
     def __str__(self):
         if self.status:

diff --git a/app/templates/network/person_detail.html b/app/templates/network/person_detail.html
index 2623982a5fb4d4eb5872af365d75656ca09ed4f4..b047ec995a10209fc968c00d31c5da9e8e0d281f 100644 (file)
--- a/app/templates/network/person_detail.html
+++ b/app/templates/network/person_detail.html
@@ -31,7 +31,7 @@
         {{ person.bio|richtext_filters|safe }}
     {% endeditable %}
 
-    {% if not person.email and person.activities.all and person.teams %}<p><strong>{% trans 'Email' %} :</strong> {{ person_email }}</p>{% elif person.email %}<p><strong>{% trans 'Email' %} :</strong> {{ person.email|unspam }}</p>{% endif %}
+    {% if not person.email and person.activities.all and person.activities.all.0.teams.all %}<p><strong>{% trans 'Email' %} :</strong> {{ person_email }}</p>{% elif person.email %}<p><strong>{% trans 'Email' %} :</strong> {{ person.email|unspam }}</p>{% endif %}
 
     {% with person.activities.all as activities %}
       {% if activities %}