Changeset 9814

Timestamp:

21 Dec 2012, 08:51:44 (12 years ago)

Author:

Henrik Bettermann

Message:

Add clearance_enabled field to ISessionConfiguration. Clearance can now be disabled for certain sessions via this switch.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (4 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/viewlets.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -631 +631 @@
         )
 
+    clearance_enabled = schema.Bool(
+        title = _(u'Clearance enabled'),
+        default = False,
+        )
+
     def getSessionString():
         """Returns the session string from the vocabulary.

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

@@ -126 +126 @@
         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
+
 class StudentsBreadcrumb(Breadcrumb):
     """A breadcrumb for the students container.
@@ -724 +734 @@
 
     def update(self):
+        if clearance_disabled_message(self.context):
+            self.flash(clearance_disabled_message(self.context))
+            self.redirect(self.url(self.context,'view_clearance'))
+            return
         if self.context.state == REQUESTED:
             IWorkflowInfo(self.context).fireTransition('clear')
@@ -744 +758 @@
     form_fields = grok.AutoFields(
         IUGStudentClearance).select('officer_comment')
+
+    def update(self):
+        if clearance_disabled_message(self.context):
+            self.flash(clearance_disabled_message(self.context))
+            self.redirect(self.url(self.context,'view_clearance'))
+            return
+        return super(StudentRejectClearancePage, self).update()
 
     @action(_('Save comment and reject clearance now'), style='primary')
@@ -771 +792 @@
         return
 
-    #def render(self):
-    #    return
 
 class StudentPersonalDisplayFormPage(KofaDisplayFormPage):

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

@@ -1267 +1267 @@
         self.assertRaises(
             Unauthorized, self.browser.open, other_student_path)
+        # Clearance is disabled for this session
+        self.browser.open(self.clearance_path)
+        self.assertFalse('Clear student' in self.browser.contents)
+        self.browser.open(self.student_path + '/clear')
+        self.assertTrue('Clearance is disabled for this session'
+            in self.browser.contents)
+        self.app['configuration']['2004'].clearance_enabled = True
         # Only in state clearance requested the CO does see the 'Clear' button
         self.browser.open(self.clearance_path)

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

@@ -35 +35 @@
     VALIDATED)
 from waeup.kofa.students.browser import (
+    clearance_disabled_message,
     StudentClearanceManageFormPage,
     StudentBaseManageFormPage, StudentFilesUploadPage,
@@ -263 +264 @@
     @property
     def target_url(self):
+        if clearance_disabled_message(self.context):
+            return ''
         if self.context.state != REQUESTED:
             return ''
@@ -278 +281 @@
     @property
     def target_url(self):
+        if clearance_disabled_message(self.context):
+            return ''
         if self.context.state not in (REQUESTED, CLEARED):
             return ''