Merge branch 'master' into rwd

[wolnelektury.git] / apps / catalogue / urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index 647bc9f..4320919 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -3,8 +3,11 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf.urls.defaults import *
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf.urls.defaults import *

+from django.db.models import Max
+from django.views.generic import ListView, RedirectView

 from catalogue.feeds import AudiobookFeed
 from catalogue.views import CustomPDFFormView
 from catalogue.feeds import AudiobookFeed
 from catalogue.views import CustomPDFFormView

+from catalogue.models import Book

 
 
 SLUG = r'[a-z0-9-]*'
 
 
 SLUG = r'[a-z0-9-]*'


@@ -15,16 +18,11 @@ urlpatterns = patterns('picture.views',
     url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
 )
 
     url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
 )
 

-# workaround for Django ticket #17111; redirect when resolved
-urlpatterns += patterns('search.views',
-    url(r'^szukaj/$', 'main'),  
+urlpatterns += patterns('',
+    # old search page - redirected
+    url(r'^szukaj/$', RedirectView.as_view(
+            url='/szukaj/', query_string=True)),

 )
 )

-#urlpatterns += patterns('django.views.generic.simple',
-#    # old search page - redirected
-#    url(r'^szukaj/$', 'redirect_to',
-#        
-#        {'url': '/szukaj/', 'query_string': True}),  
-#)

 
 urlpatterns += patterns('catalogue.views',
     url(r'^$', 'catalogue', name='catalogue'),
 
 urlpatterns += patterns('catalogue.views',
     url(r'^$', 'catalogue', name='catalogue'),


@@ -35,7 +33,15 @@ urlpatterns += patterns('catalogue.views',
     url(r'^daisy/$', 'daisy_list', name='daisy_list'),
     url(r'^tags/$', 'tags_starting_with', name='hint'),
     url(r'^jtags/$', 'json_tags_starting_with', name='jhint'),
     url(r'^daisy/$', 'daisy_list', name='daisy_list'),
     url(r'^tags/$', 'tags_starting_with', name='hint'),
     url(r'^jtags/$', 'json_tags_starting_with', name='jhint'),

-    #url(r'^szukaj/$', 'search', name='old_search'),
+    url(r'^nowe/$', ListView.as_view(
+        queryset=Book.objects.filter(parent=None).order_by('-created_at'),
+        template_name='catalogue/recent_list.html'), name='recent_list'),
+    url(r'^nowe/audiobooki/$', ListView.as_view(
+        queryset=Book.objects.filter(media__type='ogg').annotate(m=Max('media__uploaded_at')).order_by('-m'),
+            template_name='catalogue/recent_audiobooks_list.html'), name='recent_audiobooks_list'),
+    url(r'^nowe/daisy/$', ListView.as_view(
+        queryset=Book.objects.filter(media__type='daisy').annotate(m=Max('media__uploaded_at')).order_by('-m'),
+            template_name='catalogue/recent_daisy_list.html'), name='recent_daisy_list'),

 
     url(r'^custompdf/(?P<slug>%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'),
 
 
     url(r'^custompdf/(?P<slug>%s)/$' % SLUG, CustomPDFFormView(), name='custom_pdf_form'),