Changeset 1103

Timestamp:

12.07.2010 21:40:56 (19 months ago)

Author:

zmsdev

Message:

Applied fix for validation of relative inline-links.

File:

• ZMS/trunk/_objattrs.py (modified) (2 diffs)

ZMS/trunk/_objattrs.py

@@ -974 +974 @@
             else:
               href = ''
-          ob = self
+          ob = self.getSelf(self.PAGES)
           for el in href.split( '/'):
             if ob is not None:
@@ -980 +980 @@
                 ob = ob.aq_parent
               elif len( el) > 0:
-                ob = getattr( ob, el, None)
+                obs = filter(lambda x: x.id==el or x.getDeclId(self.REQUEST)==el, ob.objectValues(self.dGlobalAttrs.keys()))
+                if len(obs) == 0:
+                  ob = None
+                  break
+                ob = obs[0]
           if ob is None:
             _globals.writeBlock( self, '[formatObjAttrValue]: invalid href=%s'%href)