]> git.parisson.com Git - mezzo.git/commitdiff
fix featured playlist
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 10 May 2016 17:43:42 +0000 (19:43 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 10 May 2016 17:43:42 +0000 (19:43 +0200)
app/festival/templatetags/festival_tags.py
app/templates/base.html
app/templates/index.html

index aaf3c4c6aee391d2f2aa4b78ce8b71599a7d6e06..6507c6cfbdff1ba37aacc4989ac34b0d2b78961d 100644 (file)
@@ -36,6 +36,8 @@ def featured(*args):
         featured_list.append(video)
     for artist in featured.artists.all():
         featured_list.append(artist)
+    for playlist in featured.playlists.all():
+        featured_list.append(playlist)
     shuffle(featured_list)
     return featured_list
 
index 68df4bacf288fafae7cc7c042988a8a167dea1ac..64cafbeb01aa15ad9d8bae05a3702922981533d2 100644 (file)
     </ul>
     {% endcomment %}
 
+    {% featured as featured_list %}
+
     <div class="site__content">
         <div class="container">
             <main class="main" role="main">
                 {% include "includes/twitter.html" %}
                 {% include "includes/instafeed.html" %}
 
-                {% featured as featured %}
                 <h2 class="sidebar__title">{% trans "Playlist" %}</h2>
-                {% for playlist in featured.playlists.all %}
-                {% include 'festival/inc/audio_playlist.html' %}
+                {% for item in featured_list %}
+                 {% if item|get_class == 'Playlist' %}
+                  {% with item as playlist %}
+                    {% include 'festival/inc/audio_playlist.html' %}
+                  {% endwith %}
+                 {% endif %}
                 {% endfor %}
 
                 <div class="cta__panel">
index 82771ce43ff372d63f2f09a2d4f8d865b2914191..4b2fecb8818777207f84c55a471efecb48e39961 100644 (file)
@@ -19,8 +19,6 @@
 <a href="{% url 'page' edito.slug %}" class="event__meta__btn">{% trans "Read the edito" %}</a>
 <br>
 
-{% featured as featured_list %}
-
 <div class="last__media">
     <h2 class="section__title">{% trans "Featured" %}</h2>
     <div class="msry__container">