[CustomPage] : separate events from other dynamic content

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 329e008e12e9eaa6b920a7874e56e0083146b4ef..a3db871a6f121ac4c5108fb8fb18fdf679f87757 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -226,3 +226,15 @@ def get_media_type(media):
     elif match('audio', mime_type):
         media_type = "Audio"
     return media_type
+
+@register.filter
+def filter_content(dynamic_contents):
+    dict = {}
+    dict["event"] = []
+    dict["other"] = []
+    for dc in dynamic_contents:
+        if dc.content_object._meta.model_name== "event":
+            dict["event"].append(dc)
+        else :
+            dict["other"].append(dc)
+    return dict

diff --git a/app/templates/pages/custompage.html b/app/templates/pages/custompage.html
index 6e324e11742d601fb86f29e5894cc37b0a02ea4c..8ded5a887f5dd5b89997f9807706e3440c7b7347 100644 (file)
--- a/app/templates/pages/custompage.html
+++ b/app/templates/pages/custompage.html
@@ -93,4 +93,13 @@
       {% endwith %}
     {% endblock %}
 
+    {% block page_related_content %}
+        {% with dynamic_content=page.dynamic_content_pages.all object=page %}
+        {# with dynamic_content=page.dynamic_content_pages.all|filter_content object=page #}
+            {# dynamic_content.event #}
+            {# dynamic_content.other #}
+            {% include "core/inc/related_content.html" %}
+        {% endwith %}
+    {% endblock %}
+
 {% endwith %}