Changeset 9072

Timestamp:

27 Jul 2012, 05:20:39 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove perm_address field.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (1 diff)
• interfaces.py (modified) (5 diffs)
• tests/test_browser.py (modified) (4 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/applicant.py

@@ -32 +32 @@
     grok.provides(INigeriaApplicant)
 
+    # Meanwhile perm_address has been removed but the attribute still exists in
+    # some applicant objects. So we'll leave it until all 2012 students
+    # have been created.
     create_names = Applicant.create_names + [
-        'lga', 'nationality', 'perm_address']
+        'lga', 'nationality', 'perm_address']  
 
 # Set all attributes of NigeriaApplicant required in INigeriaApplicant as field

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

@@ -97 +97 @@
             for field in UG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
-        form_fields['perm_address'].custom_widget = BytesDisplayWidget
+        #form_fields['perm_address'].custom_widget = BytesDisplayWidget
         form_fields['notice'].custom_widget = BytesDisplayWidget
         return form_fields

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

@@ -35 +35 @@
 
 # Fields to be omitted in all display forms. course_admitted is
-# rendered seperately.
+# rendered separately.
 
 OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted',
@@ -64 +64 @@
     'email', 'phone',
     'date_of_birth', 'sex',
-    'nationality', 'lga', 'perm_address',
+    'nationality', 'lga', #'perm_address',
     'course2', 'screening_venue',
     'screening_date')
@@ -80 +80 @@
     'email', 'phone',
     'date_of_birth', 'sex',
-    'nationality', 'lga', 'perm_address',
+    'nationality', 'lga', #'perm_address',
     'course2', 'screening_venue',
     'screening_date')
@@ -109 +109 @@
         required = False,
         )
-    perm_address = schema.Text(
-        title = _(u'Permanent Address'),
-        required = False,
-        )
+    #perm_address = schema.Text(
+    #    title = _(u'Permanent Address'),
+    #    required = False,
+    #    )
     course1 = schema.Choice(
         title = _(u'1st Choice Course of Study'),
@@ -221 +221 @@
         required = False,
         )
-    perm_address = schema.Text(
-        title = _(u'Permanent Address'),
-        required = False,
-        )
+    #perm_address = schema.Text(
+    #    title = _(u'Permanent Address'),
+    #    required = False,
+    #    )
     course1 = schema.Choice(
         title = _(u'1st Choice Course of Study'),

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/tests/test_browser.py

@@ -343 +343 @@
             'jamb_score,jamb_subjects,lastname,lga,locked,middlename,'
             'nationality,notice,nysc_lga,'
-            'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
+            'nysc_year,password,phone,pp_school,presently_inst,'
             'reg_number,result_uploaded,screening_date,screening_score,screening_venue,sex,'
             'state,student_id,'
@@ -350 +350 @@
         self.assertTrue(
             'Application initialized by system\'],,,,,,,,,Tester,,0,M.,,'
-            '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
+            '"Some notice\nin lines.",,,any password,+234-123-12345,,,'
             '123456,,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
             'initialized,,0,dp2011'
@@ -368 +368 @@
             'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
             'nationality','notice','nysc_lga',
-            'nysc_year','password','perm_address','phone','pp_school','presently_inst',
+            'nysc_year','password','phone','pp_school','presently_inst',
             'reg_number','result_uploaded',
             'screening_date','screening_score','screening_venue','sex',
@@ -392 +392 @@
             'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
             'nationality','notice','nysc_lga',
-            'nysc_year','password','perm_address','phone','pp_school','presently_inst',
+            'nysc_year','password','phone','pp_school','presently_inst',
             'reg_number','result_uploaded','screening_date','screening_score',
             'screening_venue','sex',