Changeset 10248 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

29 May 2013, 06:46:54 (12 years ago)

Author:

Henrik Bettermann

Message:

Bursary Officers are only allowed to export bursary data at all levels in academics.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -2875 +2875 @@
     def _set_exporter_values(self):
         # We provide all student exporters, nothing else, yet.
+        # Bursary Officers don't have the general exportData permission
+        # and are only allowed to export bursary data.
+        if not checkPermission('waeup.exportData', self.context):
+            self.exporters = [('Bursary Data', 'bursary')]
+            return
         exporters = []
         for name in EXPORTER_NAMES:
@@ -2947 +2952 @@
     """
     grok.context(VirtualFacultiesExportJobContainer)
-
-    def _set_exporter_values(self):
-        # Only Bursary Officers will use this export. They must
-        # not be allowed to export regular student data at faculties level
-        self.exporters = [('Bursary Data', 'bursary')]
-        return
 
 class DepartmentExportJobContainerJobConfig(ExportJobContainerJobConfig):

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

@@ -2886 +2886 @@
         self.browser.getControl("Configure new export").click()
         # Only the bursary exporter us available ot this level
-        self.assertFalse('<option value="students">' in self.browser.contents)
-        self.assertTrue('<option value="bursary">' in self.browser.contents)
+        #self.assertFalse('<option value="students">' in self.browser.contents)
+        #self.assertTrue('<option value="bursary">' in self.browser.contents)
         self.browser.getControl(name="exporter").value = ['bursary']
         self.browser.getControl(name="session").value = ['2004']