Changeset 16277 for main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Timestamp:

12 Oct 2020, 09:35:47 (4 years ago)

Author:

Henrik Bettermann

Message:

Revert r16276.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (6 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/browser.py

@@ -55 +55 @@
     ICustomPGApplicantEdit, ICustomUGApplicantEdit,
     ICustomApplicantOnlinePayment, ICustomApplicantRefereeReport,
-    ITranscriptApplicant, ICustomApplicantRegisterUpdate
+    ITranscriptApplicant
     )
 from kofacustom.iuokada.interfaces import MessageFactory as _
@@ -369 +369 @@
         return form_fields
 
-class CustomApplicantRegistrationPage(ApplicantRegistrationPage):
-    """Captcha'd registration page for applicants.
-    """
-    @property
-    def form_fields(self):
-        form_fields = None
-        if self.context.mode == 'update':
-            form_fields = grok.AutoFields(ICustomApplicantRegisterUpdate).select(
-                'lastname','reg_number','email')
-        else: #if self.context.mode == 'create':
-            form_fields = grok.AutoFields(ICustomUGApplicant).select(
-                'firstname', 'middlename', 'lastname', 'email', 'phone')
-        return form_fields
-
 class RefereeReportAddFormPage(RefereeReportAddFormPage):
     """Add-form to add an referee report. This form

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/interfaces.py

@@ -36 +36 @@
     nats_vocab, GenderSource, StudyLevelSource)
 from waeup.kofa.applicants.interfaces import (
-    contextual_reg_num_source, IApplicantBaseData, IApplicantRefereeReport,
-    contextual_email_source, IApplicantRegisterUpdate)
+    contextual_reg_num_source, IApplicantBaseData, IApplicantRefereeReport)
 from waeup.kofa.refereeentries import RefereeEntryField
 from kofacustom.nigeria.applicants.interfaces import (
@@ -145 +144 @@
     """
 
-    email = TextLineChoice(
-        title = _(u'Email Address Test'),
-        required = False,
-        constraint=validate_email,
-        source = contextual_email_source,
-        )
-
     subtype = schema.Choice(
         title = _(u'Application Subtype'),
@@ -387 +379 @@
     adding them to the PG_OMIT* tuples.
     """
-
-    email = TextLineChoice(
-        title = _(u'Email Address Test'),
-        required = False,
-        constraint=validate_email,
-        source = contextual_email_source,
-        )
 
     sponsor = schema.Choice(
@@ -618 +603 @@
         required = True,
         )
-    email = TextLineChoice(
-        title = _(u'Email Address Test'),
-        required = False,
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
         constraint=validate_email,
-        source = contextual_email_source,
         )
     date_of_birth = FormattedDate(
@@ -654 +638 @@
         required = True,
         )
-    email = TextLineChoice(
-        title = _(u'Email Address Test'),
-        required = False,
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
         constraint=validate_email,
-        source = contextual_email_source,
         )
     date_of_birth = FormattedDate(
@@ -673 +656 @@
     'phone'].order =  ICustomPGApplicantEdit['email'].order
 
-class ICustomApplicantRegisterUpdate(IApplicantRegisterUpdate):
-    """This is a representation of an applicant for first-time registration.
-    This interface is used when applicants use the registration page to
-    update their records.
-    """
-
-    email = TextLineChoice(
-        title = _(u'Email Address Test'),
-        required = False,
-        constraint=validate_email,
-        source = contextual_email_source,
-        )
-
 class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
     """An applicant payment via payment gateways.