Changeset 9828

Timestamp:

5 Jan 2013, 17:26:01 (12 years ago)

Author:

uli

Message:

Simplify last fix a bit and add regression test. Welcome home, by the way.

Location:

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

Files:

• certcourses.txt (modified) (1 diff)
• course.py (modified) (1 diff)

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

@@ -115 +115 @@
     >>> list(fac['DEPT2'].courses)
     [u'CRS2']
+
+If a single course is registered for several levels in a single
+certificate, this will not block things if the course is removed
+(regression test):
+
+We add the same course as a reference for level 200 and level 300:
+
+    >>> fac['DEPT'].certificates['CERT'].addCertCourse(
+    ...   fac['DEPT2'].courses['CRS2'], level=200)
+    >>> fac['DEPT'].certificates['CERT'].addCertCourse(
+    ...   fac['DEPT2'].courses['CRS2'], level=300)
+
+Deleting the course (thus also the refererrers) will work:
+
+    >>> del root['app']['faculties']['FAC']['DEPT2'].courses['CRS2']
+
+Now all references are gone:
+
+    >>> list(a.certificates['CERT'])
+    []
+
+and also the course itself vanished:
+
+    >>> list(fac['DEPT2'].courses)
+    []

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

@@ -83 +83 @@
 
     results = cat.searchResults(course_code=(code, code))
-    # Only one certcourse per certificate is needed
-    reduced_results = []
-    for certcourse in results:
-        cert = certcourse.__parent__
-        if cert in  [i.__parent__ for i in reduced_results]:
-            continue
-        reduced_results.append(certcourse)
-    # Now we can apply delCertCourses
-    for certcourse in reduced_results:
-        cert = certcourse.__parent__
+
+    # remove each found referrer (certs might refer to same course multiple
+    # times)
+    certs = [x.__parent__ for x in results]
+    unique_certs = list(set(certs))
+    for cert in unique_certs:
         cert.delCertCourses(code)
     return