X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f59e7c3de6bd0f85a61a4d9481db60cd7369ae92..655700e4cde69f00f698a06ca18991eef784ccda:/apps/api/urls.py?ds=inline

diff --git a/apps/api/urls.py b/apps/api/urls.py
index 60b20647c..7b96337e8 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -32,7 +32,7 @@ urlpatterns = patterns(
 
 ) + patterns('',
     url(r'^$', 'django.views.generic.simple.direct_to_template',
-            {'template': 'api/main.html'}),
+            {'template': 'api/main.html'}, name='api'),
 
 
     # changes handlers
@@ -47,23 +47,22 @@ urlpatterns = patterns(
 
 
     # objects details
-    url(r'^books/(?P<book>%s)/$' % Book.URLID_RE, book_resource, name="api_book"),
+    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-]+)/$',
         tag_resource, name="api_tag"),
-    url(r'^books/(?P<book>%s)/fragments/(?P<anchor>[a-z0-9-]+)/$' % Book.URLID_RE,
+    url(r'^books/(?P<book>[a-z0-9-]+)/fragments/(?P<anchor>[a-z0-9-]+)/$',
         fragment_resource, name="api_fragment"),
 
     # books by tags
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})books/$', book_list_resource),
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$', book_list_resource, {"top_level": True}),
 
+    url(r'^pictures/$', picture_resource),
+
     # fragments by book, tags, themes
     # this should be paged
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', fragment_list_resource),
 
     # tags by category
     url(r'^(?P<category>[a-z0-9-]+)/$', tag_list_resource),
-
-    # picture by slug
-    url(r'^pictures/$', picture_resource)
 )