Changeset 9563

Timestamp:

6 Nov 2012, 20:29:35 (12 years ago)

Author:

Henrik Bettermann

Message:

We need a special interface for the StudentPersonalEditFormPage?. Some fields on this form are required.

Location:

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

Files:

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

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

@@ -52 +52 @@
     IStudentsContainer, IStudent,
     IUGStudentClearance,IPGStudentClearance,
-    IStudentPersonal, IStudentBase, IStudentStudyCourse,
+    IStudentPersonal, IStudentPersonalEdit, IStudentBase, IStudentStudyCourse,
     IStudentStudyCourseTransfer,
     IStudentAccommodation, IStudentStudyLevel,
@@ -791 +791 @@
     grok.name('edit_personal')
     grok.require('waeup.handleStudent')
-    form_fields = grok.AutoFields(IStudentPersonal).omit('personal_updated')
+    form_fields = grok.AutoFields(IStudentPersonalEdit).omit('personal_updated')
     label = _('Edit personal data')
     pnav = 4

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

@@ -310 +310 @@
     """
 
+class IStudentPersonalEdit(IStudentPersonal):
+    """Interface for editing personal data by students.
+
+    Here we can repeat the fields from IStudentPersonal and set the
+    `required` if necessary.
+    """
+
+    perm_address = schema.Text(
+        title = _(u'Permanent Address'),
+        required = True,
+        )
+
 class IStudentUpdateByRegNo(IStudent):
     """Representation of a student. Skip regular reg_number validation.

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

@@ -41 +41 @@
 from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.interfaces import (
-    IStudent, IStudentNavigation, ICSVStudentExporter)
+    IStudent, IStudentNavigation, IStudentPersonalEdit, ICSVStudentExporter)
 from waeup.kofa.students.payments import StudentPaymentsContainer
 from waeup.kofa.students.utils import generate_student_id
@@ -52 +52 @@
     owned by students.
     """
-    grok.implements(IStudent, IStudentNavigation)
+    grok.implements(IStudent, IStudentNavigation, IStudentPersonalEdit)
     grok.provides(IStudent)
 

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

@@ -488 +488 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_personal_path)
+        self.browser.getControl("Save").click()
+        # perm_address is required in IStudentPersonalEdit
+        self.assertMatches('...Required input is missing...',
+                           self.browser.contents)
+        self.browser.getControl(name="form.perm_address").value = 'My address!'
         self.browser.getControl("Save").click()
         self.assertMatches('...Form has been saved...',