Move check to one place in code.

bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml

@@ -62,11 +62,9 @@ if address not in MARKER and port not in MARKER:\n
   for index_uid in range(len(uid)):\n
     document_relative_url = getRelativeUrl[index_uid]\n
     document = portal.restrictedTraverse(document_relative_url)\n
-    allowed_portal_type_list = portal.getPortalDocumentTypeList() + portal.getPortalEmbeddedDocumentTypeList()\n
     # XXX: we do check if "data" methods exists on pretending to be Document portal types\n
     # we need a way to do this by introspection\n
-    if document.getPortalType() in allowed_portal_type_list and \\\n
-       ((getattr(document, "getData", None) is not None and document.getData() not in MARKER) or \\\n
+    if ((getattr(document, "getData", None) is not None and document.getData() not in MARKER) or \\\n
         (getattr(document, "getBaseData", None) is not None and document.getBaseData() not in MARKER)):\n
       document.activate(serialize_tag="conversion").Base_callPreConvert()\n
 </string> </value>

bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/Base_callPreConvert.xml

@@ -57,6 +57,12 @@
 portal = context.getPortalObject()\n
 \n
 portal_type = context.getPortalType()\n
+allowed_portal_type_list = portal.getPortalDocumentTypeList() + portal.getPortalEmbeddedDocumentTypeList()\n
+\n
+if portal_type not in allowed_portal_type_list:\n
+  # no need to convert any non DMS types\n
+  return\n
+\n
 format = portal.portal_preferences.getPreferredImageFormat()\n
 quality = portal.portal_preferences.getPreferredImageQuality()\n
 preferred_image_size = portal.portal_preferences.getPreferredImageSize()\n

bt5/erp5_dms_conversion_catalog/bt/revision

-13
+14
\ No newline at end of file