From 8d0d0a8e69d5394cea2a1dc07f167fc9b11c369d Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Thu, 25 Aug 2016 17:36:24 +0200
Subject: [PATCH] Correcting page sliders

---
 .../core/templatetags/organization_tags.py           |  2 +-
 app/templates/magazine/article/article_detail.html   | 12 ++++++------
 app/templates/pages/departmentpage.html              |  8 ++++----
 app/templates/pages/teampage.html                    |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 3ebd45db..41ef12b9 100644
--- 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 78f025e7..32ed8e93 100644
--- 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 730631ec..6bb47f00 100644
--- 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 2848e58b..4a6db78f 100644
--- 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 %}
-- 
2.39.5