Commit 135410e7 authored by Bartek Górny's avatar Bartek Górny

skip deleted docs when looking for existing one; produce a bit more informative error message;

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14626 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ae32ee26
...@@ -797,7 +797,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin): ...@@ -797,7 +797,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
# Find all document with same (reference, version, language) # Find all document with same (reference, version, language)
kw = dict(portal_type=self.getPortalDocumentTypeList(), kw = dict(portal_type=self.getPortalDocumentTypeList(),
reference=self.getReference(), reference=self.getReference(),
validation_state="!=cancelled") where_expression="validation_state NOT IN ('cancelled', 'deleted')")
if self.getVersion(): kw['version'] = self.getVersion() if self.getVersion(): kw['version'] = self.getVersion()
if self.getLanguage(): kw['language'] = self.getLanguage() if self.getLanguage(): kw['language'] = self.getLanguage()
document_list = catalog.unrestrictedSearchResults(**kw) document_list = catalog.unrestrictedSearchResults(**kw)
...@@ -820,7 +820,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin): ...@@ -820,7 +820,7 @@ class Document(XMLObject, UrlMixIn, ConversionCacheMixin, SnapshotMixin):
raise ValueError, "[DMS] Ingestion may not change the type of an existing document" raise ValueError, "[DMS] Ingestion may not change the type of an existing document"
elif not _checkPermission(Permissions.ModifyPortalContent, existing_document): elif not _checkPermission(Permissions.ModifyPortalContent, existing_document):
self.setUniqueReference(suffix='unauthorized') self.setUniqueReference(suffix='unauthorized')
raise Unauthorized, "[DMS] You are not allowed to update this document" raise Unauthorized, "[DMS] You are not allowed to update the existing document which has the same coordinates (id %s)" % existing_document.getId()
else: else:
update_kw = {} update_kw = {}
for k in self.propertyIds(): for k in self.propertyIds():
......
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