fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for fabfile_local.py
[wolnelektury.git]
/
apps
/
api
/
urls.py
diff --git
a/apps/api/urls.py
b/apps/api/urls.py
index
8a14519
..
7c12c01
100644
(file)
--- a/
apps/api/urls.py
+++ b/
apps/api/urls.py
@@
-1,8
+1,11
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import patterns, url
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView
-from piston.authentication import OAuthAuthentication, oauth_access_token
+from piston.authentication import OAuthAuthentication, oauth_access_token
from piston.resource import Resource
from api import handlers
from piston.resource import Resource
from api import handlers
@@
-19,6
+22,9
@@
ebook_list_resource = Resource(handler=handlers.EBooksHandler)
#book_list_resource = Resource(handler=handlers.BooksHandler)
book_resource = Resource(handler=handlers.BookDetailHandler)
#book_list_resource = Resource(handler=handlers.BooksHandler)
book_resource = Resource(handler=handlers.BookDetailHandler)
+collection_resource = Resource(handler=handlers.CollectionDetailHandler)
+collection_list_resource = Resource(handler=handlers.CollectionsHandler)
+
tag_list_resource = Resource(handler=handlers.TagsHandler)
tag_resource = Resource(handler=handlers.TagDetailHandler)
tag_list_resource = Resource(handler=handlers.TagsHandler)
tag_resource = Resource(handler=handlers.TagDetailHandler)
@@
-48,6
+54,10
@@
urlpatterns = patterns(
url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
+ # books by collections
+ url(r'^collections/$', collection_list_resource, name="api_collections"),
+ url(r'^collections/(?P<slug>[^/]+)/$', collection_resource, name="api_collection"),
+
# objects details
url(r'^books/(?P<book>[a-z0-9-]+)/$', book_resource, name="api_book"),
url(r'^(?P<category>[a-z0-9-]+)/(?P<slug>[a-z0-9-]+)/$',
# objects details
url(r'^books/(?P<book>[a-z0-9-]+)/$', book_resource, name="api_book"),
url(r'^(?P<category>[a-z0-9-]+)/(?P<slug>[a-z0-9-]+)/$',