Changeset 9704

Timestamp:

21 Nov 2012, 15:36:28 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust browser module to changes in base package.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

• browser.py (modified) (4 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -58 +58 @@
     """ Page to display student base data
     """
-    form_fields = grok.AutoFields(INigeriaStudentBase).omit('password', 'suspended')
+    form_fields = grok.AutoFields(INigeriaStudentBase).omit(
+        'password', 'suspended', 'suspended_comment')
 
 class NigeriaStudentBaseManageFormPage(StudentBaseManageFormPage):
@@ -115 +116 @@
     """Deliver a PDF slip of the context.
     """
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'email')
+    omit_fields = ('password', 'suspended', 'suspended_comment',
+        'phone', 'adm_code', 'email')
 
     @property
@@ -160 +162 @@
     """Deliver a PDF slip of the context.
     """
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'sex', 'email')
+    omit_fields = ('password', 'suspended', 'suspended_comment',
+        'phone', 'adm_code', 'sex', 'email')
 
 class NigeriaOnlinePaymentDisplayFormPage(OnlinePaymentDisplayFormPage):
@@ -197 +200 @@
     form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'sex', 'email')
+    omit_fields = ('password', 'suspended', 'suspended_comment', 'phone',
+        'adm_code', 'sex', 'email')
 
 class NigeriaExportPDFBedTicketSlipPage(ExportPDFBedTicketSlipPage):
     """Deliver a PDF slip of the context.
     """
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'email')
+    omit_fields = ('password', 'suspended', 'suspended_comment',
+        'phone', 'adm_code', 'email')
 
 class StudentPassportActionButton(StudentPassportActionButton):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -60 +60 @@
             'religion,scd_sit_date,scd_sit_fname,scd_sit_no,'
             'scd_sit_results,scd_sit_type,sex,student_id,'
-            'suspended,password,state,history,certcode,is_postgrad,'
+            'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
             'current_level,current_session\r\nmy adm code,,,,'
             '"[(\'visual_art\', \'A1\')]",0,my clr code,1981-02-04#,,,'
@@ -66 +66 @@
             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,,,,,'
-            '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,created,'
+            '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,,created,'
             '[u\'2012-11-06 13:16:41 WAT - Record created by system\'],'
             'CERT1,0,200,2012\r\n',