diff options
| author | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
|---|---|---|
| committer | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
| commit | 4fbeb44718ca0f378baeae6fdda29388ff70b29d (patch) | |
| tree | 0b9008f684664753e7e7667b811e2246ff3e7312 /sublab_project/news/urls.py | |
| parent | 1347410c5125775f8b84bff0d12086158c39bea0 (diff) | |
| parent | 4d8b78ba8747804d0e090eae0674b22ba8f53198 (diff) | |
Merge branch 'master' of sublab.org:subweb
Conflicts:
sublab_project/news/templates/news/news_list.html
Diffstat (limited to 'sublab_project/news/urls.py')
| -rw-r--r-- | sublab_project/news/urls.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sublab_project/news/urls.py b/sublab_project/news/urls.py index fe682ad..7f2029c 100644 --- a/sublab_project/news/urls.py +++ b/sublab_project/news/urls.py @@ -2,9 +2,12 @@ from django.conf.urls.defaults import patterns, include, url from django.views.generic import DetailView from news.models import News +from news.feeds import NewsFeed, NewsFeedAtom from news.views import NewsListView urlpatterns = patterns('', url(r'^$', NewsListView.as_view(), name='news_list'), url(r'^news/(?P<slug>[-\w]+)/$', DetailView.as_view(model=News), name='news_detail'), + url(r'^newsfeed/rss/$', NewsFeed(), name='news_feed'), + url(r'^newsfeed/atom/$', NewsFeedAtom(), name='news_feed_atom'), ) |