From: Joseph Spiros Date: Thu, 10 Jun 2010 08:09:00 +0000 (-0400) Subject: Merge git://github.com/melinath/philo into melinath X-Git-Tag: philo-0.9~82^2~1 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/fa522c1bbf16351ce4dc32b003733b9447404581 Merge git://github.com/melinath/philo into melinath * git://github.com/melinath/philo: Fixed the context variable leak in the blockcontainer tag. Fixed a bug where the ContainerNode had a nodelist_empty=None, whereas nodelist_empty is expected to be an iterable by line 314 of models.py. Also added 'nodelist_main' to the manage.py line 314 list of subnodelist possibilities and added a child_nodelists attribute to ContainerNode for possible forward-compatibility. Fixed a bug where the ContainerNode had a nodelist_empty=None, whereas nodelist_empty is expected to be an iterable by line 314 of models.py. Also added 'nodelist_main' to the manage.py line 314 list of subnodelist possibilities and added a child_nodelists attribute to ContainerNode for possible forward-compatibility. First draft of blockcontainer functionality. Tries to reuse most of the code related to the original container tag by extending it, simply interpreting the values slightly differently. Added documentation and help text to models.py and containers.py to hopefully improve usability. --- fa522c1bbf16351ce4dc32b003733b9447404581