Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 9226)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 9227)
@@ -236,2 +236,32 @@
             'code,local_roles,title,title_prefix\r\n')
         return
+
+class SupplementaryBrowserTests(UniversitySetup):
+    # These are additional tests to browser.txt
+
+    def test_set_former_course(self):
+        # A certificate course will be automatically removed when 
+        # the former_course attribute of the corresponding course is set.
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.assertTrue(self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].has_key('COURSE1_100'))
+        self.browser.open('http://localhost/app/faculties/fac1/dep1/courses/COURSE1/manage')
+        self.browser.getControl(name="form.former_course").value = ['selected']
+        self.browser.getControl("Save").click()
+        self.assertFalse(self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].has_key('COURSE1_100'))
+        return
+
+    def test_remove_course(self):
+        # A certificate course will be automatically removed when
+        # the corresponding course is removed.
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.assertTrue(self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].has_key('COURSE1_100'))
+        self.browser.open('http://localhost/app/faculties/fac1/dep1/manage')
+        ctrl = self.browser.getControl(name='val_id')
+        ctrl.getControl(value='COURSE1').selected = True
+        self.browser.getControl("Remove selected", index=0).click()
+        self.assertFalse(self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].has_key('COURSE1_100'))
+        return
Index: /main/waeup.kofa/trunk/src/waeup/kofa/university/course.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/university/course.py	(revision 9226)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/university/course.py	(revision 9227)
@@ -90,4 +90,13 @@
     return
 
+@grok.subscribe(ICourse, grok.IObjectModifiedEvent)
+def handle_set_former_course(course, event):
+    """If a former course attribute is set, we make sure that referrers in a
+       certificatescontainer are removed.
+    """
+    if event.object.former_course:
+        handle_course_removed(course, event)
+    return
+
 class CoursesPlugin(grok.GlobalUtility):
     """A plugin that updates courses.
