Changeset 9824

Timestamp:

5 Jan 2013, 13:48:04 (12 years ago)

Author:

Henrik Bettermann

Message:

delCertCourse deletes all certificate courses referring to the same course if level is not given. This has caused a KeyError? in handle_course_removed.

Tests will follow.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/university

Files:

• certificate.py (modified) (1 diff)
• course.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.py

@@ -75 +75 @@
 
     def delCertCourse(self, code, level=None):
-        """Delete a certificate course denoted by its code.
+        """Delete certificate courses.
+
+        We might have more than one certificate course for a course.
+        If level is not provided all certificate courses referring
+        to the same course will be deleted.
         """
         keys = list(self.keys()) # create list copy

main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

@@ -75 +75 @@
     code = course.code
 
-    # Find all certificatecourses that refer to given course...
+    # Find all certificatecourses that refer to given course
     try:
         cat = getUtility(ICatalog, name='certcourses_catalog')
@@ -83 +83 @@
 
     results = cat.searchResults(course_code=(code, code))
+    # Only one certcourse per certificate is needed
+    reduced_results = []
     for certcourse in results:
-        # Remove that referrer...
+        cert = certcourse.__parent__
+        if cert in  [i.__parent__ for i in reduced_results]:
+            continue
+        reduced_results.append(certcourse)
+    # Now we can apply delCertCourse
+    for certcourse in reduced_results:
         cert = certcourse.__parent__
         cert.delCertCourse(code)
-        cert._p_changed = True
     return