Changeset 13289

Timestamp:

6 Oct 2015, 15:30:04 (9 years ago)

Author:

Henrik Bettermann

Message:

Upgrade to waeup.kofa 1.3.3

Location:

main/kofacustom.sampleuni/trunk

Files:

• grok-1.1.cfg (added)
• setup.py (modified) (1 diff)
• src/kofacustom/sampleuni/students/browser.py (modified) (1 diff)
• src/kofacustom/sampleuni/students/export.py (modified) (3 diffs)
• src/kofacustom/sampleuni/students/tests/test_export.py (modified) (4 diffs)
• src/kofacustom/sampleuni/students/viewlets.py (modified) (1 diff)
• versions.cfg (modified) (2 diffs)

main/kofacustom.sampleuni/trunk/setup.py

@@ -9 +9 @@
     'grokui.admin',
     'grokcore.startup',
-    'waeup.kofa >= 1.3.1',
+    'waeup.kofa >= 1.3.3',
     ],
 

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/browser.py

@@ -27 +27 @@
 from waeup.kofa.students.browser import (
     StudyLevelEditFormPage, StudyLevelDisplayFormPage,
-    StudentBasePDFFormPage, ExportPDFCourseRegistrationSlipPage,
+    StudentBasePDFFormPage,
     CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
     msave, emit_lock_message)

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/export.py

@@ -29 +29 @@
     StudentStudyLevelExporter,
     CourseTicketExporter,
-    StudentPaymentsExporter)
+    StudentPaymentExporter)
 from waeup.kofa.utils.helpers import iface_names
 
@@ -53 +53 @@
     #: Fieldnames considered by this exporter
     fields = tuple(sorted(iface_names(
-        ICustomStudentStudyLevel) + ['level'])) + (
+        ICustomStudentStudyLevel))) + (
         'student_id', 'number_of_tickets','certcode')
 
@@ -64 +64 @@
         'certcode', 'display_fullname')
 
-class CustomStudentPaymentsExporter(StudentPaymentsExporter):
+class CustomStudentPaymentExporter(StudentPaymentExporter):
     """Exporter for OnlinePayment instances.
     """

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/tests/test_export.py

@@ -7 +7 @@
 from kofacustom.sampleuni.utils.utils import CustomKofaUtils
 from kofacustom.sampleuni.students.export import (
-    CustomStudentExporter, CustomStudentPaymentsExporter)
+    CustomStudentExporter, CustomStudentPaymentExporter)
 from kofacustom.sampleuni.testing import FunctionalLayer
 
@@ -61 +61 @@
         return
 
-class CustomStudentPaymentsExporterTest(StudentImportExportSetup):
+class CustomStudentPaymentExporterTest(StudentImportExportSetup):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomStudentPaymentsExporterTest, self).setUp()
+        super(CustomStudentPaymentExporterTest, self).setUp()
         self.setup_for_export()
         return
@@ -72 +72 @@
     def test_ifaces(self):
         # make sure we fullfill interface contracts
-        obj = CustomStudentPaymentsExporter()
+        obj = CustomStudentPaymentExporter()
         verifyObject(ICSVExporter, obj)
-        verifyClass(ICSVExporter, CustomStudentPaymentsExporter)
+        verifyClass(ICSVExporter, CustomStudentPaymentExporter)
         return
 
@@ -83 +83 @@
         self.student['payments']['my-payment'].r_company = 'interswatch'
         self.student['payments']['my-payment'].r_card_num = '789'
-        exporter = CustomStudentPaymentsExporter()
+        exporter = CustomStudentPaymentExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()

main/kofacustom.sampleuni/trunk/src/kofacustom/sampleuni/students/viewlets.py

@@ -25 +25 @@
     StudentFileDisplay, StudentFileUpload, Image)
 from waeup.kofa.students.browser import (
-    ExportPDFClearanceSlipPage, StudyCourseDisplayFormPage,
+    StudyCourseDisplayFormPage,
     StudyLevelDisplayFormPage)
 

main/kofacustom.sampleuni/trunk/versions.cfg

@@ -2 +2 @@
 [buildout]
 # default set of versions we use.
-extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
+#extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
+extends = grok-1.1.cfg
 
 versions = versions
@@ -151 +152 @@
 zc.zodbrecipes = 2.0.0
 
-waeup.kofa = 1.3.1
+waeup.kofa = 1.3.3
 
 # Added by buildout at 2015-01-16 07:34:12.267717