From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 28 Jun 2010 20:00:30 +0000 (-0400)
Subject: Merge branch 'master' into penfield
X-Git-Tag: philo-0.9~67^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e877b2e3808010dba06a2e3a9830c176a1c10a54?hp=c9f444ffc08eff21b504db84701b7afc21330da9

Merge branch 'master' into penfield
---

diff --git a/README b/README
index 4170400..bf55344 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Philo is a foundation for developing web content management systems.
 
 Prerequisites:
 	* Python 2.5.4+ <http://www.python.org/>
-	* Django 1.1.1+ <http://www.djangoproject.com/>
+	* Django 1.2+ <http://www.djangoproject.com/>
 	* (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
 
 To contribute, please visit the project website <http://philo.ithinksw.org/>.
diff --git a/models/pages.py b/models/pages.py
index 354293f..5f75494 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -43,9 +43,10 @@ class Template(TreeModel):
 				nodes = []
 				for node in nodelist:
 					try:
-						for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
-							if hasattr(node, nodelist_name):
-								nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+						if hasattr(node, 'child_nodelists'):
+							for nodelist_name in node.child_nodelists:
+								if hasattr(node, nodelist_name):
+									nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
 						if isinstance(node, ContainerNode):
 							nodes.append(node)
 						elif isinstance(node, ExtendsNode):