[Mpuls-commits] r3980 - base/trunk/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-10-18 11:06:14 +0200 (Mon, 18 Oct 2010)
New Revision: 3980

Modified:
   base/trunk/mpulsweb/lib/navigation.py
Log:
* mpulsweb/lib/navigation.py (NavigationTreeBuilder.build): Issue893:
Do not render children of Page-RG, because of some issues in ordering
the items in navigation and on the overview page. The overview page is
displayed as a childe instead of a folder now.


Modified: base/trunk/mpulsweb/lib/navigation.py
===================================================================
--- base/trunk/mpulsweb/lib/navigation.py	2010-10-15 06:41:19 UTC (rev 3979)
+++ base/trunk/mpulsweb/lib/navigation.py	2010-10-18 09:06:14 UTC (rev 3980)
@@ -179,7 +179,7 @@
 
         icon = []
         entry = []
-        if self.is_child():
+        if self.is_child() or self.repeat: # Render RG als page (issue893)
             select_link = select_item_url(self.key)
             icon.append(u'<a href="%s" %s>'
                         % (select_link, CHECK_MODIFICATION))
@@ -241,7 +241,9 @@
         out.append(u'</td>')
 
         out.append(u'</tr>')
-        if self.is_open and self.children:
+
+        # Ignore rendering RG als page (issue893)
+        if self.is_open and self.children and not self.repeat:
             for num, child in enumerate(self.children):
                 child.render(page, out, get_image, error_lookup, num)