Changeset 12127 for main/waeup.ikoba/trunk

Timestamp:

3 Dec 2014, 18:09:28 (10 years ago)

Author:

Henrik Bettermann

Message:

When checking conversion during import, contracts do not belong to
customers. Thus all portal documents must be returned by getValues.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/vocabularies.py

@@ -26 +26 @@
 from zc.sourcefactory.basic import BasicSourceFactory
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
+from waeup.ikoba.sourcefactory import SmartBasicContextualSourceFactory
 from waeup.ikoba.interfaces import SimpleIkobaVocabulary, SUBMITTED, VERIFIED
 from waeup.ikoba.interfaces import MessageFactory as _
@@ -145 +146 @@
 
     def getValues(self, context):
-        documents = context.customer['documents'].values()
+        # When checking conversion during import, contracts do not belong to
+        # customers. Thus all portal documents must be returned.
+        user_id = getattr(getattr(context, 'customer', None), 'user_id', None)
+        catalog = getUtility(ICatalog, name='documents_catalog')
+        results = catalog.searchResults(user_id=(user_id, user_id))
         resultlist = [
-            value for value in documents if value.state in (SUBMITTED, VERIFIED)]
+            value for value in results if value.state in (SUBMITTED, VERIFIED)]
         return resultlist