Merge branch 'master' into sunburnt

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

diff --git a/apps/infopages/views.py b/apps/infopages/views.py
index d457653..d5dee76 100644 (file)
--- a/apps/infopages/views.py
+++ b/apps/infopages/views.py
@@ -3,18 +3,23 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext, Template
+from django.template import RequestContext, Template, TemplateSyntaxError
 
 from infopages.models import InfoPage
 
 
 def infopage(request, slug):
-    page = InfoPage.objects.get(slug=slug)
-
     page = get_object_or_404(InfoPage, slug=slug)
     rc = RequestContext(request)
-    left_column = Template(page.left_column).render(rc)
-    right_column = Template(page.right_column).render(rc)
+    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('infopages/infopage.html', locals(),
                 context_instance=RequestContext(request))