Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
2a072475
Commit
2a072475
authored
Jan 04, 2016
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "XXX erp5_dms:" to have nice diff output
This reverts commit
6394078f
.
parent
32461b7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
...ortal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
+2
-3
No files found.
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.xml
View file @
2a072475
...
...
@@ -53,8 +53,7 @@
<value>
<string>
from ZODB.POSException import ConflictError\n
from Products.ERP5.Document.Document import ConversionError\n
from Products.ERP5Type.Log import log\n
if context.getExternalProcessingState() == \'converted\':\n
return \n
\n
message = None\n
try:\n
return context.updateBaseMetadata(**kw)\n
...
...
@@ -75,7 +74,7 @@ isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPos
if isTransitionPossible(context, \'conversion_failed\'):\n
# mark document as conversion failed if not already done by convertToBaseFormat\n
context.conversionFailed(comment=message)\n
el
if context.getExternalProcessingState() not in (\'converted\', \'empty\')
:\n
el
se
:\n
# just save problem message in workflow history\n
context.processConversionFailed(comment=message)\n
log(\'%s %s\' %(context.getRelativeUrl(), message))\n
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment