X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/34a9cd2a670e84771d1d54e6fd6af87bcb1c279c..8d5b1f789ed643ac9582398b370e6cf5137b8a6b:/philo/templatetags/containers.py

diff --git a/philo/templatetags/containers.py b/philo/templatetags/containers.py
index be94a3d..11ccd88 100644
--- a/philo/templatetags/containers.py
+++ b/philo/templatetags/containers.py
@@ -7,12 +7,22 @@ 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, contentlets, references):
+		self.contentlets = dict(((c.name, c) for c in contentlets))
+		self.references = dict((((c.name, ContentType.objects.get_for_id(c.content_type_id)), c) for c in references))
+
+
 class ContainerNode(template.Node):
 	def __init__(self, name, references=None, as_var=None):
 		self.name = name
@@ -20,37 +30,49 @@ class ContainerNode(template.Node):
 		self.references = references
 	
 	def render(self, context):
-		content = settings.TEMPLATE_STRING_IF_INVALID
-		if 'page' in context:
-			container_content = self.get_container_content(context)
-		else:
-			container_content = None
+		container_content = self.get_container_content(context)
 		
 		if self.as_var:
 			context[self.as_var] = container_content
 			return ''
 		
-		if not container_content:
-			return ''
-		
 		return container_content
 	
 	def get_container_content(self, context):
-		page = context['page']
+		try:
+			container_context = context.render_context[CONTAINER_CONTEXT_KEY]
+		except KeyError:
+			try:
+				page = context['page']
+			except KeyError:
+				return settings.TEMPLATE_STRING_IF_INVALID
+			
+			contentlet_specs, contentreference_specs = page.template.containers
+			contentlets = page.contentlets.filter(name__in=contentlet_specs)
+			q = Q()
+			for name, ct in contentreference_specs.items():
+				q |= Q(name=name, content_type=ct)
+			references = page.contentreferences.filter(q)
+			
+			container_context = ContainerContext(contentlets, references)
+			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)
-				content = contentlet.content
-			except ObjectDoesNotExist:
+				contentlet = container_context.contentlets[self.name]
+			except KeyError:
 				content = ''
+			else:
+				content = contentlet.content
 		return content