Changing the Template container node detection code to use the child_nodelists attrib...

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 354293f..5f75494 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -43,9 +43,10 @@ class Template(TreeModel):
                                nodes = []
                                for node in nodelist:
                                        try:
                                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):
                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                elif isinstance(node, ExtendsNode):