Changeset 11772

Timestamp:

31 Jul 2014, 04:38:23 (10 years ago)

Author:

Henrik Bettermann

Message:

Provide customizable method for disabling clearance by clearance officers.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (3 diffs)
• src/waeup/kofa/students/utils.py (modified) (1 diff)
• src/waeup/kofa/students/viewlets.py (modified) (3 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3dev (unreleased)
 ===================
+
+* Provide customizable method for disabling clearance by clearance officers.
 
 * Merge Javascript functions into one file. Add Javascript function

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

@@ -135 +135 @@
         yield value_dict
 
-def clearance_disabled_message(student):
-    try:
-        session_config = grok.getSite()[
-            'configuration'][str(student.current_session)]
-    except KeyError:
-        return _('Session configuration object is not available.')
-    if not session_config.clearance_enabled:
-        return _('Clearance is disabled for this session.')
-    return None
-
 def addCourseTicket(view, course=None):
     students_utils = getUtility(IStudentsUtils)
@@ -768 +758 @@
 
     def update(self):
-        if clearance_disabled_message(self.context):
-            self.flash(clearance_disabled_message(self.context))
+        cdm = getUtility(IStudentsUtils).clearance_disabled_message(self.context)
+        if cdm:
+            self.flash(cdm)
             self.redirect(self.url(self.context,'view_clearance'))
             return
@@ -794 +785 @@
 
     def update(self):
-        if clearance_disabled_message(self.context):
-            self.flash(clearance_disabled_message(self.context), type="warning")
+        cdm = getUtility(IStudentsUtils).clearance_disabled_message(self.context)
+        if cdm:
+            self.flash(cdm, type="warning")
             self.redirect(self.url(self.context,'view_clearance'))
             return

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

@@ -910 +910 @@
         return bedticket.bed_coordinates
 
+    def clearance_disabled_message(self, student):
+        try:
+            session_config = grok.getSite()[
+                'configuration'][str(student.current_session)]
+        except KeyError:
+            return _('Session configuration object is not available.')
+        if not session_config.clearance_enabled:
+            return _('Clearance is disabled for this session.')
+        return None
+
     VERDICTS_DICT = {
         '0': _('(not yet)'),

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

@@ -35 +35 @@
     VALIDATED, GRADUATED, TRANSCRIPT)
 from waeup.kofa.students.browser import (
-    clearance_disabled_message,
     StudentClearanceManageFormPage,
     StudentBaseManageFormPage, StudentFilesUploadPage,
@@ -272 +271 @@
     @property
     def target_url(self):
-        if clearance_disabled_message(self.context):
+        cdm = getUtility(IStudentsUtils).clearance_disabled_message(self.context)
+        if cdm:
             return ''
         if self.context.state != REQUESTED:
@@ -289 +289 @@
     @property
     def target_url(self):
-        if clearance_disabled_message(self.context):
+        cdm = getUtility(IStudentsUtils).clearance_disabled_message(self.context)
+        if cdm:
             return ''
         if self.context.state not in (REQUESTED, CLEARED):