From: melinath Date: Thu, 1 Jul 2010 21:19:43 +0000 (-0400) Subject: Minor corrections to containers to ensure setting of context var even in cases where... X-Git-Tag: philo-0.9~54^2~2 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/068bf4cbbbba9423ea60511ac079b5ecc107feaf?hp=4e82deefc47c7b5d6a9ff46bbcfe1473d8eba285 Minor corrections to containers to ensure setting of context var even in cases where content=None --- diff --git a/models/base.py b/models/base.py index 700b1e7..2f5bf93 100644 --- a/models/base.py +++ b/models/base.py @@ -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 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: