From 9585cb5f1dfa0adba3b70d85fae40297e3df75b1 Mon Sep 17 00:00:00 2001 From: Emilie Date: Wed, 28 Sep 2016 18:46:57 +0200 Subject: [PATCH] Menus in project page --- app/organization/projects/views.py | 4 ++++ app/templates/projects/project_detail.html | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/organization/projects/views.py b/app/organization/projects/views.py index a1e7c310..bbbbb788 100644 --- a/app/organization/projects/views.py +++ b/app/organization/projects/views.py @@ -25,4 +25,8 @@ class ProjectDetailView(SlugMixin, DetailView): break context['department'] = department + 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() return context diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html index 910ee260..98755f3d 100644 --- a/app/templates/projects/project_detail.html +++ b/app/templates/projects/project_detail.html @@ -59,15 +59,12 @@ {% if project.content %} {{ project.content|richtext_filters|safe }} {% endif %} + {{ page_branch }} {% endblock %} {% block page_sidebar %} - {% if project.topic and project.topic.parent %} - {% page_menu "pages/menus/current_tree_secondary.html" project.topic.parent.pages.all.0 %} - {% elif project.topic %} - {% page_menu "pages/menus/current_tree_secondary.html" project.topic.pages.all.0 %} - {% endif %} + {{ block.super }} {% endblock %} {% block page_link %} -- 2.39.5