diff --git a/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvertReferencedImageList.xml b/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvertReferencedImageList.xml index e9e476498772fe0bc1e0ed9452491fd67b5cfac4..29a7b59dcf4162d6cad3b6404d7b8a0f39844e2f 100644 --- a/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvertReferencedImageList.xml +++ b/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/WebPage_preConvertReferencedImageList.xml @@ -85,11 +85,11 @@ for image_url in image_url_list:\n convert_string = part_list[1]\n \n # check we have locally such a reference so we can convert it\n - kw = {\'portal_type\': portal.getPortalDocumentTypeList() + portal.getPortalEmbeddedDocumentTypeList(),\n - \'reference\': reference,\n - \'validation_state\': validation_state}\n + catalog_kw = {\'portal_type\': portal.getPortalDocumentTypeList() + portal.getPortalEmbeddedDocumentTypeList(),\n + \'reference\': reference,\n + \'validation_state\': validation_state}\n \n - document = portal.portal_catalog.getResultValue(**kw)\n + document = portal.portal_catalog.getResultValue(**catalog_kw)\n if document is not None:\n # try to pre convert it based on extracted URL\'s arguments\n convert_kw = convertUrlArgumentsToDict(convert_string)\n @@ -106,10 +106,15 @@ for image_url in image_url_list:\n for key in convert_kw.keys():\n if key not in API_ARGUMENT_LIST:\n convert_kw.pop(key)\n +\n + # due to API we need certain arguments\n + if convert_kw.get(\'quality\') is None:\n + convert_kw[\'quality\'] = kw.get(\'quality\')\n \n # do real conversion\n format = convert_kw.get(\'format\')\n - if format not in MARKER:\n + quality = convert_kw.get(\'quality\')\n + if format not in MARKER and quality not in MARKER:\n # format is mandatory if it\'s missing then anyway URL request will fail so\n # don\'t bother create an activity\n document.activate(priority=4, tag="conversion").Base_callPreConvert(**convert_kw)\n diff --git a/bt5/erp5_dms_conversion_catalog/bt/revision b/bt5/erp5_dms_conversion_catalog/bt/revision index aabe6ec3909c9d4871f8f89ef88ca3b6795ebd29..8fdd954df9831dfd29ceec0d74829b02f3f5d8c3 100644 --- a/bt5/erp5_dms_conversion_catalog/bt/revision +++ b/bt5/erp5_dms_conversion_catalog/bt/revision @@ -1 +1 @@ -21 +22 \ No newline at end of file