Minor corrections to containers to ensure setting of context var even in cases where...
authormelinath <stephen.r.burrows@gmail.com>
Thu, 1 Jul 2010 21:19:43 +0000 (17:19 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Thu, 1 Jul 2010 21:19:43 +0000 (17:19 -0400)
models/base.py
templatetags/containers.py

index 700b1e7..2f5bf93 100644 (file)
@@ -20,7 +20,7 @@ class Tag(models.Model):
 
 class Titled(models.Model):
        title = models.CharField(max_length=255)
-       slug = models.SlugField()
+       slug = models.SlugField(max_length=255)
        
        def __unicode__(self):
                return self.title
index 90debf6..7ed0bdc 100644 (file)
@@ -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: