fix unlisted pages and page tree recursion
authorTero Marttila <terom@fixme.fi>
Sat, 07 Feb 2009 02:19:35 +0200
changeset 13 178ea40bbc44
parent 12 2abc5ace0b15
child 14 b88d23696b98
fix unlisted pages and page tree recursion
lib/menu.py
lib/page.py
--- a/lib/menu.py	Sat Feb 07 02:12:32 2009 +0200
+++ b/lib/menu.py	Sat Feb 07 02:19:35 2009 +0200
@@ -19,7 +19,7 @@
         self.page = _page_tree.get_page(page.url)
 
         # the selected pagen's inheritance
-        self.ancestry = self.page.get_ancestry()
+        self.ancestry = self.page.get_ancestry() if self.page else []
         
         # list of menu items == page siblings
         self.items = _page_tree.root.children
--- a/lib/page.py	Sat Feb 07 02:12:32 2009 +0200
+++ b/lib/page.py	Sat Feb 07 02:19:35 2009 +0200
@@ -281,7 +281,7 @@
             return '\n'.join('%s%s' % (' '*indent, line) for line in [
                 "%-15s : %s" % (node.name, node.title)
             ] + [
-                _print_node(indent + 4, child) for child in node.children
+                _print_node(indent + 4, child) for child in node.children if child != node
             ])
 
         return _print_node(0, self.root)