From 8b584b19dfdcdebc6ff9b2d4fa00cf5cd497889c Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 23 Sep 2016 11:12:51 +0200
Subject: [PATCH] Fix project topic list

---
 .../core/templatetags/organization_tags.py          |  2 +-
 app/templates/pages/page.html                       |  1 +
 .../{projectopicpage.html => projecttopicpage.html} | 13 +++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename app/templates/pages/{projectopicpage.html => projecttopicpage.html} (90%)

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 1000ea1a..693d9c80 100644
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -111,4 +111,4 @@ def in_category(objects, category):
 
 @register.filter
 def sub_topics(topic):
-    return Topic.objects.filter(parent=topic)
+    return ProjectTopic.objects.filter(parent=topic)
diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index bbe57272..6cea6239 100644
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -16,6 +16,7 @@
 {% endmetablock %}{% endblock %}
 
 {% block main %}
+
     <div class="page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
         <div class="container">
 
diff --git a/app/templates/pages/projectopicpage.html b/app/templates/pages/projecttopicpage.html
similarity index 90%
rename from app/templates/pages/projectopicpage.html
rename to app/templates/pages/projecttopicpage.html
index ff57699d..4bbae4dc 100644
--- a/app/templates/pages/projectopicpage.html
+++ b/app/templates/pages/projecttopicpage.html
@@ -1,4 +1,4 @@
-{% extends "pages/custompage.html" %}
+{% extends "pages/page.html" %}
 {% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
@@ -45,15 +45,16 @@
 
     {% with page.projecttopicpage.project_topic as topic %}
       {% for sub_topic in topic|sub_topics %}
-        {{ sub_topic }}
+        {{ sub_topic }}<br>
           {% trans "European and national projects" %}<br>
           {% for project in sub_topic.projects.all|get_type:"external project" %}
-            {{ project }}
-          {% enfor %}
+            {{ project }}<br>
+          {% endfor %}
           {% trans "Internal projects" %}<br>
           {% for project in sub_topic.projects.all|get_type:"internal project" %}
-            {{ project }}
-          {% enfor %}
+            {{ project }}<br>
+          {% endfor %}
       {% endfor %}
+    {% endwith %}
 
 {% endblock %}
-- 
2.39.5