Commit 6394078f authored by Tristan Cavelier's avatar Tristan Cavelier

XXX erp5_dms:

parent fb48d9cb
<module> <module>
<category_list>
<category>business_application/9</category>
</category_list>
<id>document_ingestion_module</id> <id>document_ingestion_module</id>
<permission_list> <permission_list>
<permission type='tuple'> <permission type='tuple'>
...@@ -79,6 +82,7 @@ ...@@ -79,6 +82,7 @@
<role>Assignor</role> <role>Assignor</role>
<role>Associate</role> <role>Associate</role>
<role>Auditor</role> <role>Auditor</role>
<role>Author</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='tuple'> <permission type='tuple'>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>specialise/portal_memcached/persistent_memcached_plugin</string> <string>specialise/portal_memcached/1</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
<value> <string>from ZODB.POSException import ConflictError\n <value> <string>from ZODB.POSException import ConflictError\n
from Products.ERP5.Document.Document import ConversionError\n from Products.ERP5.Document.Document import ConversionError\n
from Products.ERP5Type.Log import log\n from Products.ERP5Type.Log import log\n
\n if context.getExternalProcessingState() == \'converted\':\n
return \n
message = None\n message = None\n
try:\n try:\n
return context.updateBaseMetadata(**kw)\n return context.updateBaseMetadata(**kw)\n
...@@ -74,7 +75,7 @@ isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPos ...@@ -74,7 +75,7 @@ isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPos
if isTransitionPossible(context, \'conversion_failed\'):\n if isTransitionPossible(context, \'conversion_failed\'):\n
# mark document as conversion failed if not already done by convertToBaseFormat\n # mark document as conversion failed if not already done by convertToBaseFormat\n
context.conversionFailed(comment=message)\n context.conversionFailed(comment=message)\n
else:\n elif context.getExternalProcessingState() not in (\'converted\', \'empty\'):\n
# just save problem message in workflow history\n # just save problem message in workflow history\n
context.processConversionFailed(comment=message)\n context.processConversionFailed(comment=message)\n
log(\'%s %s\' %(context.getRelativeUrl(), message))\n log(\'%s %s\' %(context.getRelativeUrl(), message))\n
......
...@@ -75,8 +75,8 @@ if format in VALID_IMAGE_FORMAT_LIST:\n ...@@ -75,8 +75,8 @@ if format in VALID_IMAGE_FORMAT_LIST:\n
\n \n
# Max surface allowed to convert an image,\n # Max surface allowed to convert an image,\n
# value is surface of A3 (11.7 inchs * 72 dpi * 16.5 inchs * 72 dpi)\n # value is surface of A3 (11.7 inchs * 72 dpi * 16.5 inchs * 72 dpi)\n
maximum_surface = 1000772\n maximum_surface = 1000772*2 # Ivan\n
\n #context.log(str(width * height) + \' \' + str(maximum_surface) + context.getRelativeUrl())\n
if (width * height) > maximum_surface:\n if (width * height) > maximum_surface:\n
return False\n return False\n
\n \n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment