Changeset 8187

Timestamp:

17 Apr 2012, 06:58:31 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove custom_widget setting for phone numbers in views. Overriding the PhoneWidget? registration for the PhoneNumber? schema field should help. But it doesn't work at the moment.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• applicants/browser.py (modified) (4 diffs)
• browser/pages.py (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)

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

@@ -19 +19 @@
 """
 import grok
-from waeup.uniben.widgets.phonewidget import PhoneWidget
 from waeup.kofa.applicants.interfaces import (
     IApplicantRegisterUpdate, IApplicant, IApplicantEdit)
@@ -58 +57 @@
         return form_fields
 
-class ApplicantAddFormPage(ApplicantAddFormPage):
-    """Add-form to add an applicant.
-    """
-    form_fields = grok.AutoFields(IApplicant).select(
-        'firstname', 'middlename', 'lastname',
-        'email', 'phone')
-    form_fields['phone'].custom_widget = PhoneWidget
-
 class ApplicantDisplayFormPage(ApplicantDisplayFormPage):
     """A display view for applicant data.
@@ -92 +83 @@
         else:
             form_fields = grok.AutoFields(IUGApplicant)
-        form_fields['phone'].custom_widget = PhoneWidget
         form_fields['student_id'].for_display = True
         form_fields['applicant_id'].for_display = True
@@ -114 +104 @@
                 'screening_score'
                 )
-        form_fields['phone'].custom_widget = PhoneWidget
         form_fields['applicant_id'].for_display = True
         form_fields['reg_number'].for_display = True
         return form_fields
-
-class ApplicantRegistrationPage(ApplicantRegistrationPage):
-    """Captcha'd registration page for applicants.
-    """
-
-    @property
-    def form_fields(self):
-        form_fields = None
-        if self.context.mode == 'create':
-            form_fields = grok.AutoFields(IApplicantEdit).select(
-                'firstname', 'middlename', 'lastname', 'email', 'phone')
-            form_fields['phone'].custom_widget = PhoneWidget
-        elif self.context.mode == 'update':
-            form_fields = grok.AutoFields(IApplicantRegisterUpdate).select(
-                'firstname','reg_number','email')
-        return form_fields

main/waeup.uniben/trunk/src/waeup/uniben/browser/pages.py

@@ -24 +24 @@
 from waeup.kofa.browser.pages import (
     UserEditFormPage, UserManageFormPage, AddUserFormPage)
-from waeup.uniben.widgets.phonewidget import PhoneWidget
 
 class SessionConfigurationAddFormPage(SessionConfigurationAddFormPage):
@@ -35 +34 @@
     """
     form_fields = grok.AutoFields(ISessionConfiguration)
-
-class AddUserFormPage(AddUserFormPage):
-    """Add a user account.
-    """
-    form_fields = grok.AutoFields(IUserAccount)
-    form_fields['phone'].custom_widget = PhoneWidget
-
-class UserManageFormPage(UserManageFormPage):
-    """Manage a user account.
-    """
-    form_fields = grok.AutoFields(IUserAccount).omit('name')
-    form_fields['phone'].custom_widget = PhoneWidget
-
-class UserEditFormPage(UserEditFormPage):
-    """Edit a user account by user
-    """
-    form_fields = grok.AutoFields(IUserAccount).omit(
-        'name', 'description', 'roles')
-    form_fields['phone'].custom_widget = PhoneWidget

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

@@ -32 +32 @@
     )
 from waeup.uniben.interfaces import MessageFactory as _
-from waeup.uniben.widgets.phonewidget import PhoneWidget
 
 class RequestCallbackActionButton(RequestCallbackActionButton):
@@ -51 +50 @@
     """
     form_fields = grok.AutoFields(IStudentBase).omit('student_id')
-    form_fields['phone'].custom_widget = PhoneWidget
 
 class StudentBaseEditFormPage(StudentBaseEditFormPage):
@@ -58 +56 @@
     form_fields = grok.AutoFields(IStudentBase).select(
         'email', 'phone')
-    form_fields['phone'].custom_widget = PhoneWidget