all audiobooks ever feed instead of public audiobooks in all formats

diff --git a/apps/catalogue/feeds.py b/apps/catalogue/feeds.py
index 356bb02..c79e058 100644 (file)
--- a/apps/catalogue/feeds.py
+++ b/apps/catalogue/feeds.py
@@ -42,8 +42,8 @@ class AudiobookFeed(Feed):
         if type == 'all':
             objects = objects.filter(type__in=('mp3', 'ogg', 'daisy'))
         else:
         if type == 'all':
             objects = objects.filter(type__in=('mp3', 'ogg', 'daisy'))
         else:

-            objects = objects.filter(type=type)
-        return objects[:20]
+            objects = objects.filter(type=type)[:20]
+        return objects

 
     def item_title(self, item):
         return item.name
 
     def item_title(self, item):
         return item.name

diff --git a/wolnelektury/templates/catalogue/audiobook_list.html b/wolnelektury/templates/catalogue/audiobook_list.html
index c406152..8c34c3d 100644 (file)
--- a/wolnelektury/templates/catalogue/audiobook_list.html
+++ b/wolnelektury/templates/catalogue/audiobook_list.html
@@ -8,7 +8,6 @@
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest MP3 audiobooks" %}" href="{% url audiobook_feed 'mp3' %}" />
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest Ogg Vorbis audiobooks" %}" href="{% url audiobook_feed 'ogg' %}" />
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest MP3 audiobooks" %}" href="{% url audiobook_feed 'mp3' %}" />
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest Ogg Vorbis audiobooks" %}" href="{% url audiobook_feed 'ogg' %}" />

-    <link rel="alternate" type="application/atom+xml" title="{% trans "Latest audiobooks - all formats" %}" href="{% url audiobook_feed 'all' %}" />

 {% endblock %}
 
 {% block book_list_header %}{% trans "Listing of all audiobooks" %}{% endblock %}
 {% endblock %}
 
 {% block book_list_header %}{% trans "Listing of all audiobooks" %}{% endblock %}

diff --git a/wolnelektury/templates/catalogue/daisy_list.html b/wolnelektury/templates/catalogue/daisy_list.html
index 72fcc5a..b637bed 100644 (file)
--- a/wolnelektury/templates/catalogue/daisy_list.html
+++ b/wolnelektury/templates/catalogue/daisy_list.html
@@ -7,7 +7,6 @@
 
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest DAISY audiobooks" %}" href="{% url audiobook_feed 'daisy' %}" />
 
 {% block extrahead %}
     <link rel="alternate" type="application/atom+xml" title="{% trans "Latest DAISY audiobooks" %}" href="{% url audiobook_feed 'daisy' %}" />

-    <link rel="alternate" type="application/atom+xml" title="{% trans "Latest audiobooks - all formats" %}" href="{% url audiobook_feed 'all' %}" />

 {% endblock %}
 
 {% block book_list_header %}{% trans "Listing of all DAISY files" %}{% endblock %}
 {% endblock %}
 
 {% block book_list_header %}{% trans "Listing of all DAISY files" %}{% endblock %}