Changeset 7350

Timestamp:

15 Dec 2011, 11:54:05 (13 years ago)

Author:

uli

Message:

Also put current course in appcat source, even if it is not catalogued
any more.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py

@@ -50 +50 @@
     """
     def getValues(self, context):
-        appcat = context.__parent__.application_category
+        # appliction category not available when certificate was deleted.
+        # shouldn't that info be part of applicant info instead?
+        # when we cannot determine the appcat, we will display all courses.
+        appcat = getattr(getattr(context, '__parent__', None),
+                         'application_category', None)
         catalog = getUtility(ICatalog, name='certificates_catalog')
-        return sorted(list(
-                catalog.searchResults(
-                    code=('', 'z*'),
-                    application_category=(appcat,appcat))),
-                    key=lambda value: value.code)
+        result = catalog.searchResults(
+            application_category=(appcat,appcat))
+        curr_course = context.course1
+        if curr_course is not None and curr_course not in result:
+            # display also current course even if it is not catalogued
+            # (any more)
+            result = [curr_course,] + result
+        return sorted(result, key=lambda value: value.code)