Merge branch 'master' into sunburnt

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

diff --git a/apps/infopages/views.py b/apps/infopages/views.py
index 07a416b..d5dee76 100644 (file)
--- a/apps/infopages/views.py
+++ b/apps/infopages/views.py
@@ -2,15 +2,24 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext, Template, TemplateSyntaxError
 
-from catalogue.forms import SearchForm
 from infopages.models import InfoPage
 
+
 def infopage(request, slug):
-    form = SearchForm()
-    object = InfoPage.objects.get(slug=slug)
+    page = get_object_or_404(InfoPage, slug=slug)
+    rc = RequestContext(request)
+    try:
+        left_column = Template(page.left_column).render(rc)
+    except TemplateSyntaxError:
+        left_column = ''
+
+    try:
+        right_column = Template(page.right_column).render(rc)
+    except TemplateSyntaxError:
+        left_column = ''
 
-    return render_to_response('info/base.html', locals(),
-                context_instance=RequestContext(request))
\ No newline at end of file
+    return render_to_response('infopages/infopage.html', locals(),
+                context_instance=RequestContext(request))