Merge branch 'master' into funding

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

diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py
index 9262114..01531a9 100644 (file)
--- a/apps/libraries/urls.py
+++ b/apps/libraries/urls.py
@@ -5,5 +5,6 @@ from django.http import HttpResponseRedirect
 urlpatterns = patterns('libraries.views',
     url(r'^$', 'main_view', name='libraries_main_view'),
     url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])),
-    url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='library_view'),
+    url(r'^/(?P<slug>[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'),
+    url(r'^/(?P<catalog_slug>[a-zA-Z0-9_-]+)/(?P<slug>[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'),
 )
\ No newline at end of file