From: melinath <stephen.r.burrows@gmail.com>
Date: Tue, 6 Jul 2010 17:26:20 +0000 (-0400)
Subject: Merge branch 'master' of http://github.com/ithinksw/philo
X-Git-Tag: philo-0.9~54^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0ba6fc725e250ec9a063db7dbfdc7d85619e603c?hp=6a190783eab3899c15d667e14ff20d2112d674d0

Merge branch 'master' of github.com/ithinksw/philo
---

diff --git a/admin/pages.py b/admin/pages.py
index fc60ad1..f366cd1 100644
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -82,13 +82,13 @@ class PageAdmin(ViewAdmin):
 					contentreference = page.contentreferences.get(name=container_name)
 				except ContentReference.DoesNotExist:
 					contentreference = ContentReference(name=container_name, page=page, content_type=container_content_type)
-				
-				if content == None:
-					contentreference.content_id = None
 				else:
-					contentreference.content_id = content.id
+					if content == None:
+						contentreference.delete()
 				
-				contentreference.save()
+				if content is not None:
+					contentreference.content_id = content.id
+					contentreference.save()
 
 
 class TemplateAdmin(admin.ModelAdmin):
diff --git a/templatetags/containers.py b/templatetags/containers.py
index 90debf6..7ed0bdc 100644
--- a/templatetags/containers.py
+++ b/templatetags/containers.py
@@ -32,9 +32,13 @@ class ContainerNode(template.Node):
 			container_content = self.get_container_content(context)
 		
 		if not self.nodelist_main:
-			if container_content and self.as_var:
+			if self.as_var:
 				context[self.as_var] = container_content
 				return ''
+			
+			if not container_content:
+				return ''
+			
 			return container_content
 		
 		if container_content: