X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/cc6dbd55a2af538657c288a709662b9c84949854..1b86deeeaf9c98d994e95b983c44a82e004275b0:/philo/templatetags/containers.py

diff --git a/philo/templatetags/containers.py b/philo/templatetags/containers.py
index e280e60..2c55034 100644
--- a/philo/templatetags/containers.py
+++ b/philo/templatetags/containers.py
@@ -7,12 +7,30 @@ from django import template
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Q
 from django.utils.safestring import SafeUnicode, mark_safe
 
 
 register = template.Library()
 
 
+CONTAINER_CONTEXT_KEY = 'philo_container_context'
+
+
+class ContainerContext(object):
+	def __init__(self, page):
+		contentlet_specs, contentreference_specs = page.template.containers
+		
+		contentlets = page.contentlets.filter(name__in=contentlet_specs)
+		self.contentlets = dict(((c.name, c) for c in contentlets))
+		
+		q = Q()
+		for name, ct in contentreference_specs.items():
+			q |= Q(name=name, content_type=ct)
+		references = page.contentreferences.filter(q)
+		self.references = dict(((c.name, c) for c in references))
+
+
 class ContainerNode(template.Node):
 	def __init__(self, name, references=None, as_var=None):
 		self.name = name
@@ -36,31 +54,28 @@ class ContainerNode(template.Node):
 		return container_content
 	
 	def get_container_content(self, context):
-		page = context['page']
+		try:
+			container_context = context.render_context[CONTAINER_CONTEXT_KEY]
+		except KeyError:
+			container_context = ContainerContext(context['page'])
+			context.render_context[CONTAINER_CONTEXT_KEY] = container_context
+		
 		if self.references:
 			# Then it's a content reference.
 			try:
-				contentreference = page.contentreferences.get(name__exact=self.name, content_type=self.references)
-				content = contentreference.content
-			except ObjectDoesNotExist:
+				contentreference = container_context.references[(self.name, self.references)]
+			except KeyError:
 				content = ''
+			else:
+				content = contentreference.content
 		else:
 			# Otherwise it's a contentlet.
 			try:
-				contentlet = page.contentlets.get(name__exact=self.name)
-				if '{%' in contentlet.content or '{{' in contentlet.content:
-					try:
-						content = template.Template(contentlet.content, name=contentlet.name).render(context)
-					except template.TemplateSyntaxError, error:
-						if settings.DEBUG:
-							content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, error))
-						else:
-							content = settings.TEMPLATE_STRING_IF_INVALID
-				else:
-					content = contentlet.content
-			except ObjectDoesNotExist:
-				content = settings.TEMPLATE_STRING_IF_INVALID
-			content = mark_safe(content)
+				contentlet = container_context.contentlets[self.name]
+			except KeyError:
+				content = ''
+			else:
+				content = contentlet.content
 		return content
 
 
@@ -87,7 +102,7 @@ def container(parser, token):
 				if option_token == 'references':
 					try:
 						app_label, model = remaining_tokens.pop(0).strip('"').split('.')
-						references = ContentType.objects.get(app_label=app_label, model=model)
+						references = ContentType.objects.get_by_natural_key(app_label, model)
 					except IndexError:
 						raise template.TemplateSyntaxError('"%s" template tag option "references" requires an argument specifying a content type' % tag)
 					except ValueError: