Changeset 10847

Timestamp:

15 Dec 2013, 07:12:58 (11 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

Files:

• applicants/browser.py (modified) (4 diffs)
• interswitch/tests.py (modified) (1 diff)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/applicants/browser.py

@@ -23 +23 @@
 from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
 from zope.formlib.textwidgets import BytesDisplayWidget
-from waeup.kofa.applicants.interfaces import IApplicant, IApplicantEdit
+from waeup.kofa.applicants.interfaces import (
+    IApplicant, IApplicantEdit, ISpecialApplicant)
 from waeup.kofa.applicants.browser import (ApplicantDisplayFormPage,
     ApplicantManageFormPage, ApplicantEditFormPage,
@@ -74 +75 @@
     def form_fields(self):
         if self.context.special:
-            form_fields = grok.AutoFields(IApplicant).select(
-                'applicant_id', 'firstname', 'middlename', 'lastname',
-                'reg_number', 'date_of_birth', 'email', 'special_application')
-            return form_fields
+            return grok.AutoFields(ISpecialApplicant)
         form_fields = grok.AutoFields(ICustomUGApplicant)
         if self.context.is_nd:
@@ -130 +128 @@
     def form_fields(self):
         if self.context.special:
-            form_fields = grok.AutoFields(IApplicant).select(
-                'applicant_id', 'firstname', 'middlename', 'lastname',
-                'reg_number', 'date_of_birth', 'email', 'special_application',
-                'locked')
-            return form_fields
+            return grok.AutoFields(ISpecialApplicant)
         form_fields = grok.AutoFields(ICustomUGApplicant)
         if self.context.is_nd:
@@ -154 +148 @@
 
         if self.context.special:
-            form_fields = grok.AutoFields(IApplicantEdit).select(
-                'applicant_id', 'firstname', 'middlename', 'lastname',
-                'reg_number', 'date_of_birth', 'email', 'special_application')
-            return form_fields
+            return grok.AutoFields(ISpecialApplicant)
         form_fields = grok.AutoFields(ICustomUGApplicantEdit)
         if self.context.is_nd:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -574 +574 @@
         applicant.firstname = u'Vorname'
         applicant.lastname = u'Nachname'
+        applicant.email = 'aa@aa.aa'
         applicant.special_application = u'transcript_local'
         applicant.applicant_id = u'special_anything'