Menus in project page

diff --git a/app/organization/projects/views.py b/app/organization/projects/views.py
index a1e7c31007652749ca2032132f892a109558500a..bbbbb7882239909170a3d850ae9b9f4372198964 100644 (file)
--- 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 910ee260e547ec3cc5b65d521de5c9e50dfebd9d..98755f3ddcbc8f5e4b976697d965ceffe798ea98 100644 (file)
--- 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 %}