Changeset 14247 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

2 Nov 2016, 07:14:58 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace course_registration_allowed by course_registration_forbidden method.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1592 +1592 @@
             emit_lock_message(self)
             return
-        elif not self.context.course_registration_allowed:
+        try:
+            deadline = grok.getSite()['configuration'][
+                str(self.context.level_session)].coursereg_deadline
+        except (TypeError, KeyError):
+            deadline = None
+        if deadline and deadline < datetime.now(pytz.utc):
             self.flash(_(
                 "Course registration has ended. "
@@ -2724 +2729 @@
                 mapping = {'a':max_credits}), type="warning")
             return
-        if not self.context.course_registration_allowed:
-            self.flash(_(
-                "Course registration has ended. "
-                "Please pay the late registration fee."), type="warning")
-            #self.redirect(self.url(self.context))
+        msg = self.context.course_registration_forbidden
+        if msg:
+            self.flash(msg, type="warning")
             return
         IWorkflowInfo(self.context.student).fireTransition(