Changeset 1097

Timestamp:

12.07.2010 21:23:08 (19 months ago)

Author:

zmsdev

Message:

Applied fix for references to parent-objects, except for embedded objects (requested by uni-be).

File:

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

ZMS/trunk/zmslinkelement.py

@@ -245 +245 @@
     # --------------------------------------------------------------------------
     def getEmbedType(self):
-      rtn = self.getObjAttrValue( self.getObjAttr( 'attr_type'), self.REQUEST)
-      return rtn
+      embed_type = self.getObjAttrValue( self.getObjAttr( 'attr_type'), self.REQUEST)
+      if embed_type in [ 'embed', 'recursive', 'remote']:
+        ref_obj = self.getRefObj()
+        if ref_obj is not None and ref_obj.isAnchestor( self):
+          embed_type = 'cyclic' # Error!
+      return embed_type
 
 
@@ -286 +290 @@
           ##### Object State ####
           self.setObjStateModified(REQUEST)
-          
-          ##### Constraints ####
-          ref_obj = self.getLinkObj( REQUEST.get( 'attr_ref', ''), REQUEST)
-          if ref_obj is not None and \
-             ref_obj.isAnchestor( self):
-            raise ConstraintViolation( 'Invalid url "%s" - cyclic recursion!'%REQUEST.get( 'attr_ref', ''))
           
           ##### Properties ####