X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/caafce88e26fef7f0cd5be751c1f0fa8bd0b5a06..e095f691f243784f8c8d0a9773270b9dbead18e9:/templatetags/embed.py

diff --git a/templatetags/embed.py b/templatetags/embed.py
index ef2eeb2..db5cea5 100644
--- a/templatetags/embed.py
+++ b/templatetags/embed.py
@@ -61,23 +61,28 @@ class EmbedContext(object):
 old_extends_node_init = ExtendsNode.__init__
 
 
-def get_embed_dict(nodelist):
+def get_embed_dict(embed_list, context):
 	embeds = {}
-	for n in nodelist.get_nodes_by_type(ConstantEmbedNode):
-		if n.content_type not in embeds:
-			embeds[n.content_type] = [n]
+	for e in embed_list:
+		ct = e.get_content_type(context)
+		if ct is None:
+			# Then the embed doesn't exist for this context.
+			continue
+		if ct not in embeds:
+			embeds[ct] = [e]
 		else:
-			embeds[n.content_type].append(n)
+			embeds[ct].append(e)
 	return embeds
 
 
 def extends_node_init(self, nodelist, *args, **kwargs):
-	self.embeds = get_embed_dict(nodelist)
+	self.embed_list = nodelist.get_nodes_by_type(ConstantEmbedNode)
 	old_extends_node_init(self, nodelist, *args, **kwargs)
 
 
 def render_extends_node(self, context):
 	compiled_parent = self.get_parent(context)
+	embeds = get_embed_dict(self.embed_list, context)
 	
 	if BLOCK_CONTEXT_KEY not in context.render_context:
 		context.render_context[BLOCK_CONTEXT_KEY] = BlockContext()
@@ -90,7 +95,7 @@ def render_extends_node(self, context):
 	# Add the block nodes from this node to the block context
 	# Do the equivalent for embed nodes
 	block_context.add_blocks(self.blocks)
-	embed_context.add_embeds(self.embeds)
+	embed_context.add_embeds(embeds)
 	
 	# If this block's parent doesn't have an extends node it is the root,
 	# and its block nodes also need to be added to the block context.
@@ -100,10 +105,16 @@ def render_extends_node(self, context):
 			if not isinstance(node, ExtendsNode):
 				blocks = dict([(n.name, n) for n in compiled_parent.nodelist.get_nodes_by_type(BlockNode)])
 				block_context.add_blocks(blocks)
-				embeds = get_embed_dict(compiled_parent.nodelist)
+				embeds = get_embed_dict(compiled_parent.nodelist.get_nodes_by_type(ConstantEmbedNode), context)
 				embed_context.add_embeds(embeds)
 			break
-
+	
+	# Explicitly render all direct embed children of this node.
+	if self.embed_list:
+		for node in self.nodelist:
+			if isinstance(node, ConstantEmbedNode):
+				node.render(context)
+	
 	# Call Template._render explicitly so the parser context stays
 	# the same.
 	return compiled_parent._render(context)
@@ -152,7 +163,7 @@ class ConstantEmbedNode(template.Node):
 		try:
 			return template.loader.get_template(template_name)
 		except template.TemplateDoesNotExist:
-			if not hasattr(self, 'template_name') and settings.TEMPLATE_DEBUG:
+			if hasattr(self, 'template') and settings.TEMPLATE_DEBUG:
 				# Then it's a constant node.
 				raise
 			return False
@@ -199,16 +210,13 @@ class ConstantEmbedNode(template.Node):
 		try:
 			t = context.render_context[EMBED_CONTEXT_KEY].get_embed_template(self, context)
 		except (KeyError, IndexError):
-			if settings.TEMPLATE_DEBUG:
-				raise
+			self.mark_rendered_for(context)
 			return settings.TEMPLATE_STRING_IF_INVALID
 		
 		context.push()
 		context['embedded'] = instance
-		kwargs = {}
 		for k, v in self.kwargs.items():
-			kwargs[k] = v.resolve(context)
-		context.update(kwargs)
+			context[k] = v.resolve(context)
 		t_rendered = t.render(context)
 		context.pop()
 		self.mark_rendered_for(context)
@@ -225,13 +233,11 @@ class EmbedNode(ConstantEmbedNode):
 			self.object_pk = object_pk
 		else:
 			self.object_pk = None
-			self.instance = None
 		
 		if template_name is not None:
 			self.template_name = template_name
 		else:
 			self.template_name = None
-			self.template = None
 	
 	def get_instance(self, context):
 		if self.object_pk is None:
@@ -256,7 +262,10 @@ class InstanceEmbedNode(EmbedNode):
 		return self.instance.resolve(context)
 	
 	def get_content_type(self, context):
-		return ContentType.objects.get_for_model(self.get_instance(context))
+		instance = self.get_instance(context)
+		if not instance:
+			return None
+		return ContentType.objects.get_for_model(instance)
 
 
 def get_embedded(self):