Changeset 12823 for main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py

Timestamp:

24 Mar 2015, 08:59:57 (10 years ago)

Author:

uli

Message:

Return only payments (not also related objects) in search.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py

@@ -24 +24 @@
 from zope.component import queryUtility
 from waeup.ikoba.interfaces import ICompany
-from waeup.ikoba.payments.interfaces import (
-    IPayment, IPayable
-    )
-from waeup.ikoba.payments.payment import (
-    find_payable_from_payable_id
-    )
+from waeup.ikoba.payments.interfaces import IPayment
 
 
 def search(query=None, searchtype=None):
-    hitlist = []
+    """Search payments catalog.
+
+    `query` gives a string we search, `searchtype` the fieldname.
+    """
     # Temporary solution to display all payments added
     if query == '*':
@@ -41 +39 @@
         results = Query().searchResults(
             Eq(('payments_catalog', searchtype), query))
-    hitlist = []
-    for payment in results:
-        payable_object = find_payable_from_payable_id(payment.payable_id)
-        if payable_object is not None:
-            payable = IPayable(payable_object)
-        else:
-            payable = None
-        hitlist.append((payment, payable, payable_object))
-    return hitlist
+    return results