Commit 59c855c9 authored by Ivan Tyagov's avatar Ivan Tyagov

Revert to r14448. Add missing import. Reindex both new created doc and merged one.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14465 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 32ba1042
...@@ -42,6 +42,7 @@ from Products.ERP5Type.Message import Message ...@@ -42,6 +42,7 @@ from Products.ERP5Type.Message import Message
from Products.ERP5Type.Utils import convertToUpperCase, convertToMixedCase from Products.ERP5Type.Utils import convertToUpperCase, convertToMixedCase
from Products.ERP5.Document.Url import UrlMixIn from Products.ERP5.Document.Url import UrlMixIn
from Products.ERP5.Tool.ContributionTool import MAX_REPEAT from Products.ERP5.Tool.ContributionTool import MAX_REPEAT
from AccessControl import Unauthorized
_MARKER = [] _MARKER = []
VALID_ORDER_KEY_LIST = ('user_login', 'content', 'file_name', 'input') VALID_ORDER_KEY_LIST = ('user_login', 'content', 'file_name', 'input')
...@@ -723,6 +724,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin): ...@@ -723,6 +724,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
based on a suffix based on a suffix
""" """
# Change the document reference # Change the document reference
catalog = getToolByName(self.getPortalObject(), 'portal_catalog')
reference = self.getReference() + '-%s-' % suffix + '%s' reference = self.getReference() + '-%s-' % suffix + '%s'
ref_count = 0 ref_count = 0
kw = dict(portal_type=self.getPortalDocumentTypeList()) kw = dict(portal_type=self.getPortalDocumentTypeList())
...@@ -987,10 +989,6 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin): ...@@ -987,10 +989,6 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
# Prepare the content edit parameters - portal_type should not be changed # Prepare the content edit parameters - portal_type should not be changed
kw.pop('portal_type', None) kw.pop('portal_type', None)
# if we still do not have reference extracted try to use group_reference_path
# XXX: We must catch inconsistent 're' patterns earlier and raise an exception
if kw.get('reference', None) is None:
kw['reference'] = kw.pop('group_reference_path', None)
# Try not to invoke an automatic transition here # Try not to invoke an automatic transition here
self._edit(**kw) self._edit(**kw)
# Finish ingestion by calling method # Finish ingestion by calling method
...@@ -998,7 +996,9 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin): ...@@ -998,7 +996,9 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
self.reindexObject() self.reindexObject()
# Revision merge is tightly coupled # Revision merge is tightly coupled
# to metadata discovery - refer to the documentation of mergeRevision method # to metadata discovery - refer to the documentation of mergeRevision method
return self.mergeRevision() merged_doc = self.mergeRevision()
merged_doc.reindexObject()
return merged_doc
security.declareProtected(Permissions.ModifyPortalContent, 'finishIngestion') security.declareProtected(Permissions.ModifyPortalContent, 'finishIngestion')
def finishIngestion(self): def finishIngestion(self):
......
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