Commit 85664e50 authored by Bartek Górny's avatar Bartek Górny

removed 'throw' argument

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12435 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8431f6e2
...@@ -41,7 +41,7 @@ class DocumentReferenceConstraint(Constraint): ...@@ -41,7 +41,7 @@ class DocumentReferenceConstraint(Constraint):
(although we could, e.g. by changing version number) (although we could, e.g. by changing version number)
""" """
def checkConsistency(self, object, fixit=0, throw=False): # XXX-JPS throw is not part of API - Please remove def checkConsistency(self, object, fixit=0): # XXX-JPS throw is not part of API - Please remove
""" """
Implement here the consistency checker Implement here the consistency checker
""" """
...@@ -53,8 +53,6 @@ class DocumentReferenceConstraint(Constraint): ...@@ -53,8 +53,6 @@ class DocumentReferenceConstraint(Constraint):
message = '%s is not defined' % req # XXX-JPS Is translation required here with a Message class ? message = '%s is not defined' % req # XXX-JPS Is translation required here with a Message class ?
error_list.append(self._generateError(object, N_(message))) error_list.append(self._generateError(object, N_(message)))
if error_list: if error_list:
if throw: # XXX-JPS throw is not part of API - Please remove
raise Exception(str(error_list))
return error_list return error_list
res = object.portal_catalog(reference=object.getReference(), language=object.getLanguage(), res = object.portal_catalog(reference=object.getReference(), language=object.getLanguage(),
version=object.getVersion(), portal_type=object.getPortalDocumentTypeList()) version=object.getVersion(), portal_type=object.getPortalDocumentTypeList())
...@@ -67,10 +65,7 @@ class DocumentReferenceConstraint(Constraint): ...@@ -67,10 +65,7 @@ class DocumentReferenceConstraint(Constraint):
raise Exception('Fatal error: multiple objects %s - %s - %s exist' % (object.getReference(), raise Exception('Fatal error: multiple objects %s - %s - %s exist' % (object.getReference(),
object.getLanguage(), object.getVersion())) object.getLanguage(), object.getVersion()))
#error_list.append(self._generateError(object, N_(s))) #error_list.append(self._generateError(object, N_(s)))
if hasattr(object, 'Document_additionalConsistencyCheck'): if error_list:
message = object.Document_additionalConsistencyCheck()
if message not in (None, ''):
error_list.append(self._generateError(object, N_(message)))
if error_list and throw: # XXX-JPS throw is not part of API - Please remove
raise Exception(str(error_list))
return error_list return error_list
# vim: filetype=python syntax=python shiftwidth=2
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