Removed the overkill of the patch on the Media RSS, ATOM and Sitemap …

…views. Also added loop for multiple enclosures and players in Sitemap template. git-svn-id: http://django-podcast.googlecode.com/svn@54 7eeeb57b-9f54-0410-948d-eb906a2a6a24
empty · Nov 20, 2008 · 2d410bf · 2d410bf
1 parent 6f3406e
commit 2d410bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/trunk/podcast/templates/podcast/episode_sitemap.html b/trunk/podcast/templates/podcast/episode_sitemap.html
@@ -4,8 +4,8 @@
     <url>
         <loc>{{ episode.show.link }}</loc>
         <video:video>
-            <video:content_loc>{{ enclosure_list.all.0.file.url }}</video:content_loc>
-            {% if enclosure_list.all.0 %}<video:player_loc allow_embed="{% if enclosure_list.all.0.embed %}Yes{% else %}No{% endif %}">{{ enclosure_list.all.0.player }}</video:player_loc>{% endif %}
+            {% if enclosure_list.all.0.file %}{% for enclosure in enclosure_list %}<video:content_loc>{{ enclosure_list.file.url }}</video:content_loc>{% endfor %}{% endif %}
+            {% if enclosure_list.all.0.player %}{% for enclosure in enclosure_list %}<video:player_loc allow_embed="{% if enclosure_list.all.0.embed %}Yes{% else %}No{% endif %}">{{ enclosure_list.all.0.player }}</video:player_loc>{% endif %}{% endfor %}
             {% if episode.image %}<video:thumbnail_loc>{{ episode.image.url }}</video:thumbnail_loc>{% endif %}
             <video:title>{{ episode.title }}</video:title>
             <video:description>{% if episode.summary %}{{ episode.summary|striptags }}{% else %}{{ episode.description|striptags }}{% endif %}</video:description>

diff --git a/trunk/podcast/views.py b/trunk/podcast/views.py
@@ -84,7 +84,7 @@ def show_list_feed(request, slug):
         mimetype='application/rss+xml',
         queryset=Episode.objects.filter(show__slug__exact=slug).order_by('-date')[0:21],
         extra_context={
-            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).filter(episode__slug__exact=episode_slug).order_by('-episode__date')},
+            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).order_by('-episode__date')},
         template_name='podcast/show_feed.html')
 
 
@@ -102,7 +102,7 @@ def show_list_media(request, slug):
         mimetype='application/rss+xml',
         queryset=Episode.objects.filter(show__slug__exact=slug).order_by('-date')[0:21],
         extra_context={
-            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).filter(episode__slug__exact=episode_slug).order_by('-episode__date')},
+            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).order_by('-episode__date')},
         template_name='podcast/show_feed_media.html')
 
 
@@ -120,5 +120,5 @@ def show_list_atom(request, slug):
         mimetype='application/rss+xml',
         queryset=Episode.objects.filter(show__slug__exact=slug).order_by('-date')[0:21],
         extra_context={
-            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).filter(episode__slug__exact=episode_slug).order_by('-episode__date')},
+            'enclosure_list': Enclosure.objects.filter(episode__show__slug__exact=slug).order_by('-episode__date')},
         template_name='podcast/show_feed_atom.html')