[Erp5-report] r38953 ivan - /erp5/trunk/products/ERP5/Document/Document.py

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Oct  7 14:43:14 2010
New Revision: 38953

URL: http://svn.erp5.org?rev=38953&view=rev
Log:
No need to repeat same code, define it only once.

Modified:
    erp5/trunk/products/ERP5/Document/Document.py

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=38953&r1=38952&r2=38953&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Document.py [utf8] Thu Oct  7 14:43:14 2010
@@ -515,20 +515,14 @@ class Document(DocumentExtensibleTravers
     """
     if not self.getReference():
       return True
+    kw = dict(portal_type=self.getPortalDocumentTypeList(),
+              reference=self.getReference(),
+              version=self.getVersion(),
+              language=self.getLanguage(),
+              validation_state="!=cancelled")
     catalog = getToolByName(self.getPortalObject(), 'portal_catalog')
-    self_count = catalog.unrestrictedCountResults(portal_type=self.getPortalDocumentTypeList(),
-                                            reference=self.getReference(),
-                                            version=self.getVersion(),
-                                            language=self.getLanguage(),
-                                            uid=self.getUid(),
-                                            validation_state="!=cancelled"
-                                            )[0][0]
-    count = catalog.unrestrictedCountResults(portal_type=self.getPortalDocumentTypeList(),
-                                            reference=self.getReference(),
-                                            version=self.getVersion(),
-                                            language=self.getLanguage(),
-                                            validation_state="!=cancelled"
-                                            )[0][0]
+    self_count = catalog.unrestrictedCountResults(uid=self.getUid(), **kw)[0][0]
+    count = catalog.unrestrictedCountResults(**kw)[0][0]
     # If self is not indexed yet, then if count == 1, version is not unique
     return count <= self_count