From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 5 Oct 2016 11:55:06 +0000 (+0200)
Subject: Fix team (short) name display
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c31b6010b85b3ff4d64942f096e17b31ef90ea78;p=mezzo.git

Fix team (short) name display
---

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 30d83432..2ead0a31 100644
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -165,15 +165,16 @@ class Team(Named, URL):
                 return ' - '.join((self.department.name, self.name))
         return self.name
 
+    @property
     def short(self):
         if self.organization:
-            return ' - '.join((self.organization.name, self.code))
+            return ' - '.join((self.organization.name, self.name))
         elif self.department:
             if self.department.organization:
-                return ' - '.join((self.department.organization.name, self.code))
+                return ' - '.join((self.department.organization.name, self.name))
             else:
-                return ' - '.join((self.department.name, self.code))
-        return self.code
+                return ' - '.join((self.department.name, self.name))
+        return self.name
 
 
 class TeamPage(Page, SubTitled, RichText):
diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index 5466496a..bb843a3b 100644
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -211,7 +211,7 @@
                                                         {% trans "Project lead team" %}
                                                     </div>
                                                     <div class="project-details__item-desc">
-                                                        <a href="{% url "page" project.lead_team.pages.all.0 %}">{{ project.lead_team.pages.all.0.title }}</a>
+                                                        <a href="{% url "page" project.lead_team.pages.all.0 %}">{{ project.lead_team.short }}</a>
                                                     </div>
                                                   {% elif project.lead_organization %}
                                                     <div class="project-details__item-title">
@@ -231,7 +231,7 @@
                                                 <div class="project-details__item-desc">
                                                     {% for team in project.teams.all %}
                                                         {% if team.pages.all %}
-                                                            <a href="{% url "page" team.pages.all.0 %}">{{ team.pages.all.0.title }}</a><br>
+                                                            <a href="{% url "page" team.pages.all.0 %}">{{ team.short }}</a><br>
                                                         {% endif %}
                                                     {% endfor %}
                                                     {% for organization in project.organizations.all %}