Changeset 10208

Timestamp:

23 May 2013, 05:39:45 (12 years ago)

Author:

Henrik Bettermann

Message:

Move resultset post-processing to filterCertificates method.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• interfaces.py (modified) (1 diff)
• tests/test_interfaces.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -96 +96 @@
         result = catalog.searchResults(
             application_category=(appcat,appcat))
-        result = getUtility(
+        resultlist = getUtility(
             IApplicantsUtils).filterCertificates(context, result)
-        curr_course = context.course1
-        if curr_course is not None and curr_course not in result:
-            # display also current course even if certificate has been removed
-            result = [curr_course,] + result
-        return result
+        return resultlist
 
     def getTitle(self, context, value):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_interfaces.py

@@ -22 +22 @@
 from zc.sourcefactory.browser.source import FactoredTerms
 from zope.publisher.browser import TestRequest
-from waeup.kofa.applicants.interfaces import ApplicationTypeSource
 from waeup.kofa.students.vocabularies import GenderSource
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py

@@ -81 +81 @@
         """Filter and sort certificates in AppCatCertificateSource.
         """
-        return sorted(resultset, key=lambda value: value.code)
+        resultlist = sorted(resultset, key=lambda value: value.code)
+        curr_course = context.course1
+        if curr_course is not None and curr_course not in resultlist:
+            # display also current course even if certificate has been removed
+            resultlist = [curr_course,] + resultlist
+        return resultlist
 
     def getCertTitle(self, context, value):