Correcting page sliders

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 3ebd45dbabb130f50b57098b323526c813d8c281..41ef12b9f79dff9a1605e90ca3bc36b290990cca 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -94,7 +94,7 @@ def get_mezzanine_menu_name(menu_id):
 def get_type(objects, type):
     objs = objects.filter(type=type)
     if objs:
-        return objs[0]
+        return objs
     return None
 
 @register.filter

diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index 78f025e7319cd0b28d6cac883e8d343fe76f1339..32ed8e93d7a830f6db49691131189da0fe6fba78 100644 (file)
--- a/app/templates/magazine/article/article_detail.html
+++ b/app/templates/magazine/article/article_detail.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load mezzanine_tags keyword_tags i18n  %}
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
 {% block meta_title %}{{ article.meta_title }}{% endblock %}
 
@@ -63,11 +63,11 @@
 {% endblock %}
 
 {% block page_slider %}
-  {% if article.articleimage_set.all %}
-    {% with article.articleimage_set.all as slider_images %}
-        {% include 'core/inc/slider.html' %}
-    {% endwith %}
-  {% endif %}
+  {% with article.images.all|get_type:'page_slider' as slider_images %}
+    {% if slider_images %}
+      {% include 'core/inc/slider.html' %}
+    {% endif %}
+  {% endwith %}
 {% endblock %}
 
 {% block page_related_content %}

diff --git a/app/templates/pages/departmentpage.html b/app/templates/pages/departmentpage.html
index 730631ecd39f952ba6884e53cc30e59cd11e630c..6bb47f0020834b31b2b3034f65b2f9e492409e68 100644 (file)
--- a/app/templates/pages/departmentpage.html
+++ b/app/templates/pages/departmentpage.html
@@ -51,11 +51,11 @@
 {% endblock %}
 
 {% block page_slider %}
-  {% if page.departmentpage.pageimage_set.all %}
-    {% with page.departmentpage.pageimage_set.all as slider_images %}
-        {% include 'core/inc/slider.html' %}
-    {% endwith %}
+{% with page.departmentpage.images.all|get_type:'page_slider' as slider_images %}
+  {% if slider_images %}
+    {% include 'core/inc/slider.html' %}
   {% endif %}
+{% endwith %}
 {% endblock %}
 
 {% block page_sub_content %}

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index 2848e58bc7d51b07283bdf22d9466209c90b261f..4a6db78f04dff9343a81817bd26032b2f3172db7 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -28,11 +28,11 @@
 {% endblock %}
 
 {% block page_slider %}
-  {% if page.teampage.pageimage_set.all %}
-    {% with page.teampage.pageimage_set.all as slider_images %}
+    {% with page.teampage.images.all|get_type:'page_slider' as slider_images %}
+      {% if slider_images %}
         {% include 'core/inc/slider.html' %}
+      {% endif %}
     {% endwith %}
-  {% endif %}
 {% endblock %}
 
 {% block page_content %}