reingest from url in migratePortalType should not happen if the document...

reingest from url in migratePortalType should not happen if the document already has both 'data' and 'filename'.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42008 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Base.py

@@ -3901,9 +3901,11 @@ class Base( CopyContainer,
             and self.hasProperty(property_id):
         input_kw[property_id] = self.getProperty(property_id)
     if getattr(self, 'hasUrlString', None) is not None and self.hasUrlString():
-      # URL is not stored on document
-      # pass required properties for portal_contributions.newContent
-      input_kw['url'] = self.asURL()
+      # try to reingest from url if data and/or filename is missing.
+      if not 'data' in input_kw or not 'filename' in input_kw:
+        # URL is not stored on document
+        # pass required properties for portal_contributions.newContent
+        input_kw['url'] = self.asURL()
 
     # Use meta transition to jump from one state to another
     # without existing transitions.