Merge branch 'master' into production

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

diff --git a/apps/libraries/views.py b/apps/libraries/views.py
index baf7baa..f79f2a1 100644 (file)
--- a/apps/libraries/views.py
+++ b/apps/libraries/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import render_to_response, get_object_or_404\r
 from django.template import RequestContext, Template, TemplateSyntaxError\r
 \r
-from libraries.models import Catalog\r
+from libraries.models import Catalog, Library\r
 \r
 \r
 def main_view(request):\r
@@ -9,7 +9,12 @@ def main_view(request):
     context['catalogs'] = Catalog.objects.all()\r
     return render_to_response('libraries/main_view.html', context_instance = context)\r
 \r
-def library_view(request, slug):\r
+def catalog_view(request, slug):\r
     context = RequestContext(request)\r
     context['catalog'] = get_object_or_404(Catalog.objects.filter(slug = slug).select_related())\r
+    return render_to_response('libraries/catalog_view.html', context_instance = context)\r
+    \r
+def library_view(request, catalog_slug, slug):\r
+    context = RequestContext(request)\r
+    context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug))\r
     return render_to_response('libraries/library_view.html', context_instance = context)
\ No newline at end of file