Changeset 13277 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py

Timestamp:

24 Sep 2015, 07:35:23 (9 years ago)

Author:

Henrik Bettermann

Message:

Define and use PRE_OMIT_FIELDS.

File:

• main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py (modified) (5 diffs)

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

@@ -61 +61 @@
     PUDE_OMIT_EDIT_FIELDS,
     PUDE_OMIT_RESULT_SLIP_FIELDS,
+    PRE_OMIT_DISPLAY_FIELDS,
+    PRE_OMIT_PDF_FIELDS,
+    PRE_OMIT_MANAGE_FIELDS,
+    PRE_OMIT_EDIT_FIELDS,
     )
 from kofacustom.nigeria.interfaces import MessageFactory as _
@@ -90 +94 @@
             for field in PG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
-        # Don't know what pre-degree studies are, seems to be pre-postgraduate.
-        # Many modifications are expected. Therefore, we need a dedicated
-        # elif statement (see also pages below)
-        elif self.target is not None and self.target.startswith('pre'):
-            form_fields = grok.AutoFields(INigeriaPGApplicant)
-            for field in PG_OMIT_DISPLAY_FIELDS:
+        elif self.target is not None and self.target.startswith('pre'):
+            form_fields = grok.AutoFields(INigeriaPGApplicant)
+            for field in PRE_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('cbt'):
@@ -144 +145 @@
         elif self.target is not None and self.target.startswith('pre'):
             form_fields = grok.AutoFields(INigeriaPGApplicant)
-            for field in PG_OMIT_PDF_FIELDS:
+            for field in PRE_OMIT_PDF_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('cbt'):
@@ -192 +193 @@
         elif self.target is not None and self.target.startswith('pre'):
             form_fields = grok.AutoFields(INigeriaPGApplicant)
-            for field in PG_OMIT_MANAGE_FIELDS:
+            for field in PRE_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('cbt'):
@@ -226 +227 @@
         elif self.target is not None and self.target.startswith('pre'):
             form_fields = grok.AutoFields(INigeriaPGApplicantEdit)
-            for field in PG_OMIT_EDIT_FIELDS:
+            for field in PRE_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('cbt'):