Team short code and link in projetc page, fix double breadcrumb, bugfix

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 9bf3ab18025f6317cef503c2a000ca51215e2673..21e3ff98d180b82e1e799d35350b38b3c45254cc 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -161,6 +161,16 @@ class Team(Named, URL):
                 return ' - '.join((self.department.name, self.name))
         return self.name
 
+    def short(self):
+        if self.organization:
+            return ' - '.join((self.organization.name, self.code))
+        elif self.department:
+            if self.department.organization:
+                return ' - '.join((self.department.organization.name, self.code))
+            else:
+                return ' - '.join((self.department.name, self.code))
+        return self.code
+
 
 class TeamPage(Page, SubTitled, RichText):
     """(Team description)"""

diff --git a/app/organization/projects/views.py b/app/organization/projects/views.py
index bbbbb7882239909170a3d850ae9b9f4372198964..abd8acdba0c4e75311b5fe37f4777ae504d7f2cb 100644 (file)
--- a/app/organization/projects/views.py
+++ b/app/organization/projects/views.py
@@ -28,5 +28,5 @@ class ProjectDetailView(SlugMixin, DetailView):
         if project.topic and project.topic.parent:
             context['page'] = project.topic.parent.pages.all().first()
         elif project.topic:
-            context['page'] = roject.topic.pages.all().first()
+            context['page'] = project.topic.pages.all().first()
         return context

diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index e5f83232d9b000736c1dbe89bc4ed5143be87ff9..25586a85d1a20939c49cecdf7cd4d987cd0e2747 100644 (file)
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -20,22 +20,8 @@
 {% endblock %}
 
 {% block breadcrumb_menu %}
-
     {{ block.super }}
-
-    {% if department %}
-        <li class="breadcrumb__item"><a class="breadcrumb__link" href="{{ department.pages.all.0.get_absolute_url }}">{{ department.name }}</a></li>
-    {% endif %}
-    {% if project.topic and project.topic.parent %}
-        <li class="breadcrumb__item"><a class="breadcrumb__link" href="{{ project.topic.parent.pages.all.0.get_ascendants.0.get_absolute_url }}">{{ project.topic.parent.pages.all.0.get_ascendants.0.title }}</a></li>
-        <li class="breadcrumb__item"><a class="breadcrumb__link" href="{{ project.topic.parent.pages.all.0.get_absolute_url }}">{{ project.topic.parent }}</a></li>
-    {% elif project.topic %}
-        <li class="breadcrumb__item"><a class="breadcrumb__link" href="{{ project.topic.pages.all.0.get_ascendants.0.get_absolute_url }}">{{ project.topic.pages.all.0.get_ascendants.0.title }}</a></li>
-        <li class="breadcrumb__item"><a class="breadcrumb__link" href="{{ project.topic.pages.all.0.get_absolute_url }}">{{ project.topic }}</a></li>
-    {% endif %}
-
     <li class="breadcrumb__item active">{{ project.title }}</li>
-
 {% endblock %}
 
 {% block page_title %}
@@ -195,7 +181,7 @@
                                                         {% trans "Project lead team" %}
                                                     </div>
                                                     <div class="project-details__item-desc">
-                                                        {{ project.lead_team }}
+                                                        <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">
@@ -214,7 +200,9 @@
                                                 </div>
                                                 <div class="project-details__item-desc">
                                                     {% for team in project.teams.all %}
-                                                        {{ team }}<br>
+                                                        {% if team.pages.all %}
+                                                            <a href="{% url "page" team.pages.all.0 %}">{{ team.short }}</a><br>
+                                                        {% endif %}
                                                     {% endfor %}
                                                     {% for organization in project.organizations.all %}
                                                         {% if organization.url %}