Changeset 7664 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

17 Feb 2012, 09:10:47 (13 years ago)

Author:

Henrik Bettermann

Message:

Carry-over course registration is optional and can now be switched on and off in the configuration.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• studycourse.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py

@@ -66 +66 @@
                 self[str(studylevel.level)][ticket.code] = ticket
         # Collect carry-over courses in base levels (not in repeating levels)
-        if studylevel.level % 100 == 0:
+        try:
+            co_enabled = grok.getSite()['configuration'].carry_over
+        except TypeError:
+            # In tests we might not have a site object
+            co_enabled = True
+        if co_enabled and studylevel.level % 100 == 0:
             levels = sorted(self.keys())
             index = levels.index(str(studylevel.level))

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -169 +169 @@
         self.app['configuration'].accommodation_states = ['admitted']
         self.app['configuration'].accommodation_session = 2004
+        self.app['configuration'].carry_over = True
         configuration = SessionConfiguration()
         # These attributes must also exist in the customization packages.