diff --git a/www/conservancy/apps/news/urls.py b/www/conservancy/apps/news/urls.py index 1b9d8af90f2ed63ddf53568348eedd061352a3f1..55a6f3f01609323e47b79b9d59e5931dbce90254 100644 --- a/www/conservancy/apps/news/urls.py +++ b/www/conservancy/apps/news/urls.py @@ -17,9 +17,10 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from django.conf import settings from models import PressRelease, ExternalArticle # relative import +from views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView info_dict = { 'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID), @@ -30,12 +31,16 @@ external_article_dict = { 'articles': ExternalArticle.objects.all() } -urlpatterns = patterns('django.views.generic.date_based', - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')), - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', 'archive_day', info_dict), - (r'^(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', info_dict), - (r'^(?P\d{4})/$', 'archive_year', dict(info_dict, - make_object_list=True)), +urlpatterns = patterns('', +# (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', 'conservancy.apps.news.views.object_detail', info_dict), + (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', NewsDateDetailView.as_view(**info_dict)), +# (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', 'conservancy.apps.news.views.archive_day', info_dict), + (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', NewsDayArchiveView.as_view(**info_dict)), +# (r'^(?P\d{4})/(?P[a-z]{3})/$', 'conservancy.apps.news.views.archive_month', info_dict), + (r'^(?P\d{4})/(?P[a-z]{3})/$', NewsMonthArchiveView.as_view(**info_dict)), +# (r'^(?P\d{4})/$', 'conservancy.apps.news.views.archive_year', +# dict(info_dict, make_object_list=True)), + (r'^(?P\d{4})/$', NewsYearArchiveView.as_view(**info_dict)), ) urlpatterns += patterns('',