Merge branch 'master' of http://github.com/ithinksw/philo

diff --git a/admin/pages.py b/admin/pages.py
index fc60ad1..f366cd1 100644 (file)
--- 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 (file)
--- 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: