Changeset 6859

Timestamp:

4 Oct 2011, 10:07:26 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename StudentPayments? to StudentPaymentsContainer?.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• __init__.py (modified) (2 diffs)
• browser.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• student.py (modified) (2 diffs)
• tests/test_student.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/__init__.py

@@ -7 +7 @@
 from waeup.sirp.students.container import StudentsContainer
 from waeup.sirp.students.studycourse import StudentStudyCourse
-from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.payments import StudentPaymentsContainer
 from waeup.sirp.students.accommodation import StudentAccommodation
 
@@ -16 +16 @@
     'StudentsContainer',
     'StudentStudyCourse',
-    'StudentPayments',
+    'StudentPaymentsContainer',
     'StudentAccommodation'
     ]

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

@@ -33 +33 @@
 from waeup.sirp.students.interfaces import (
     IStudentsContainer, IStudent, IStudentClearance, IStudentPasswordSetting,
-    IStudentPersonal, IStudentBase, IStudentStudyCourse, IStudentPayments,
+    IStudentPersonal, IStudentBase, IStudentStudyCourse,
     IStudentAccommodation, IStudentClearanceEdit, IStudentStudyLevel,
-    ICourseTicket, ICourseTicketAdd,
+    ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer
     )
 from waeup.sirp.students.catalog import search
@@ -97 +97 @@
     """A breadcrumb for the student payments folder.
     """
-    grok.context(IStudentPayments)
+    grok.context(IStudentPaymentsContainer)
     title = u'Payments'
 
@@ -753 +753 @@
     """ Page to display the student payments
     """
-    grok.context(IStudentPayments)
+    grok.context(IStudentPaymentsContainer)
     grok.name('index')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IStudentPayments)
+    form_fields = grok.AutoFields(IStudentPaymentsContainer)
     #grok.template('paymentspage')
     title = 'Payments'

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -306 +306 @@
     """
 
-class IStudentPayments(IWAeUPObject):
+class IStudentPaymentsContainer(IWAeUPObject):
     """A container for student payment objects.
 

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -28 +28 @@
     IStudentPersonalEdit)
 from waeup.sirp.students.studycourse import StudentStudyCourse
-from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.payments import StudentPaymentsContainer
 from waeup.sirp.students.accommodation import StudentAccommodation
 from waeup.sirp.utils.helpers import attrs_to_fields, get_current_principal
@@ -103 +103 @@
     studycourse = StudentStudyCourse()
     student['studycourse'] = studycourse
-    payments = StudentPayments()
+    payments = StudentPaymentsContainer()
     student['payments'] = payments
     accommodation = StudentAccommodation()

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py

@@ -21 +21 @@
 from waeup.sirp.students.studycourse import StudentStudyCourse
 from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
-from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.payments import StudentPaymentsContainer
 from waeup.sirp.students.accommodation import StudentAccommodation
 from waeup.sirp.students.interfaces import (
-    IStudent, IStudentStudyCourse, IStudentPayments, IStudentAccommodation,
+    IStudent, IStudentStudyCourse, IStudentPaymentsContainer, IStudentAccommodation,
     IStudentStudyLevel, ICourseTicket)
 from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
@@ -38 +38 @@
         self.studylevel = StudentStudyLevel()
         self.courseticket = CourseTicket()
-        self.payments = StudentPayments()
+        self.payments = StudentPaymentsContainer()
         self.accommodation = StudentAccommodation()
         return
@@ -53 +53 @@
         verify.verifyObject(IStudentStudyLevel, self.studylevel)
         verify.verifyObject(ICourseTicket, self.courseticket)
-        verify.verifyClass(IStudentPayments, StudentPayments)
-        verify.verifyObject(IStudentPayments, self.payments)
+        verify.verifyClass(IStudentPaymentsContainer, StudentPaymentsContainer)
+        verify.verifyObject(IStudentPaymentsContainer, self.payments)
         verify.verifyClass(IStudentAccommodation, StudentAccommodation)
         verify.verifyObject(IStudentAccommodation, self.accommodation)