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

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-09-15 11:37:28 +0200 (Thu, 15 Sep 2011)
New Revision: 5341

Modified:
   base/trunk/mpulsweb/lib/navigation.py
Log:
Issue 967: Jetzt werden auch Referencen beim Erstellen der Gliederung 
beruecksichtigt.


Modified: base/trunk/mpulsweb/lib/navigation.py
===================================================================
--- base/trunk/mpulsweb/lib/navigation.py	2011-09-15 09:16:29 UTC (rev 5340)
+++ base/trunk/mpulsweb/lib/navigation.py	2011-09-15 09:37:28 UTC (rev 5341)
@@ -81,10 +81,15 @@
     tree = session['navigation.tree']
     error_pages = set()
     for fieldandnr in session.get('uncommited_fields', []):
-        error_field = fieldandnr.split(IDENTIFIER_SEPARATOR, 1)[0]
-        error_page = g.formedTree.name2page.get(error_field, "")
-        if error_page:
-            error_pages.add(error_page.getName())
+        error_field = fieldandnr.split(IDENTIFIER_SEPARATOR, 1)[0] 
+        error_fields = [error_field]
+        ref_nodes = g.formedTree.name2ref.get(error_field, [])
+        for rnc in ref_nodes:
+            error_fields.append(rnc.getName())
+        for ef in error_fields:
+            error_page = g.formedTree.name2page.get(ef, "")
+            if error_page:
+                error_pages.add(error_page.getName())
         
     return tree.render(tree.root, FileCache(), error_pages)