[Mpuls-commits] r3397 - base/trunk/mpulsweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-08-13 14:22:04 +0200 (Fri, 13 Aug 2010)
New Revision: 3397

Modified:
   base/trunk/mpulsweb/model/phase.py
Log:
* mpulsweb/model/phase.py (PhasePart.load): Issue966: Fixed building
	links on phase overview page.


Modified: base/trunk/mpulsweb/model/phase.py
===================================================================
--- base/trunk/mpulsweb/model/phase.py	2010-08-13 10:20:01 UTC (rev 3396)
+++ base/trunk/mpulsweb/model/phase.py	2010-08-13 12:22:04 UTC (rev 3397)
@@ -9,6 +9,7 @@
 from formed.instance.backends.postgres import DBFactory as InstanceFactory
 from formed.instance.backends.common import RuleEvalContext
 from formed.instance.tree import PageInstanceNode
+from formed.meta.data import PageNode
 
 from mpulsweb.lib.helpers import tag, url_for
 from mpulsweb.lib.helper.case import walk_it 
@@ -299,7 +300,7 @@
 
         for p in walk_it(it.getRootNode()):
             meta = p.getMeta()
-            if isinstance(p, PageInstanceNode):
+            if isinstance(meta, PageNode):
                 page = meta.getName()
             flags = get_flags(meta.getFlags())
 
@@ -328,7 +329,7 @@
         if len(self.fields) > 0:
             p2 = {}
             for field in [field for field in self.fields]:
-                link = field.get_link()
+                log.debug(field.page)
                 if not p2.has_key(field.page):
                     p2[field.page] = []
                 p2[field.page].append(field)