Changeset 1780 for ZMS/trunk/_mediadb.py

Timestamp:

22.12.2011 22:21:27 (5 months ago)

Author:

zmsdev

Message:

applied fix for media-folder: link-elements may cause infinite loop (requested by desy).

File:

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

ZMS/trunk/_mediadb.py

@@ -82 +82 @@
           for obj_vers in self.getObjVersions():
             v = _objattrs.getobjattr(self,obj_vers,obj_attr,lang)
-            if v is not None:
+            if v is not None and getattr(v,'__class_name__',None) in [_blobfields.MyImage.__class_name__, _blobfields.MyFile.__class_name__]:
               mediadbfile = mediadb.storeFile(v)
               v.mediadbfile = mediadbfile
@@ -89 +89 @@
   
   # Process children.
-  if self.meta_id != 'ZMSLinkElement':
-    for ob in self.getChildNodes():
-      recurse_addMediaDb(ob,mediadb)
+  for ob in self.objectValues( self.dGlobalAttrs.keys()):
+    recurse_addMediaDb(ob,mediadb)