Changeset 10350 for main/waeup.imostate/src/waeup/imostate/applicants/browser.py

Timestamp:

22 Jun 2013, 21:39:00 (11 years ago)

Author:

Henrik Bettermann

Message:

Remove futminna customizations which are not applicable here.

File:

• main/waeup.imostate/src/waeup/imostate/applicants/browser.py (modified) (7 diffs)

main/waeup.imostate/src/waeup/imostate/applicants/browser.py

@@ -28 +28 @@
     ICustomApplicant,
     ICustomUGApplicant,
-    ICustomPGApplicant,
-    ICustomPGApplicantEdit,
     ICustomUGApplicantEdit,
-    UG_OMIT_DISPLAY_FIELDS,
-    UG_OMIT_PDF_FIELDS,
-    UG_OMIT_MANAGE_FIELDS,
-    UG_OMIT_EDIT_FIELDS,
-    PG_OMIT_DISPLAY_FIELDS,
-    PG_OMIT_PDF_FIELDS,
-    PG_OMIT_MANAGE_FIELDS,
-    PG_OMIT_EDIT_FIELDS,
-    PUTME_OMIT_EDIT_FIELDS,
-    PUTME_OMIT_DISPLAY_FIELDS,
-    PUTME_OMIT_PDF_FIELDS,
-    PUTME_OMIT_MANAGE_FIELDS,
-    PUTME_OMIT_EDIT_FIELDS,
     )
 from waeup.imostate.interfaces import MessageFactory as _
@@ -102 +87 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target.startswith('pg'):
-            form_fields = grok.AutoFields(ICustomPGApplicant)
-            for field in PG_OMIT_DISPLAY_FIELDS:
-                form_fields = form_fields.omit(field)
-        else:
-            form_fields = grok.AutoFields(ICustomUGApplicant)
-            for field in UG_OMIT_DISPLAY_FIELDS:
-                form_fields = form_fields.omit(field)
+        form_fields = grok.AutoFields(ICustomUGApplicant)
         if form_fields.get('perm_address', None):
             form_fields['perm_address'].custom_widget = BytesDisplayWidget
@@ -121 +99 @@
         if not getattr(self.context, 'screening_date'):
             form_fields = form_fields.omit('screening_date')
-        if not self.context.low_jamb_score:
-            form_fields = form_fields.omit('course2')
         return form_fields
 
@@ -136 +112 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target.startswith('pg'):
-            form_fields = grok.AutoFields(ICustomPGApplicant)
-            for field in PG_OMIT_PDF_FIELDS:
-                form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target.startswith('putme'):
-            form_fields = grok.AutoFields(ICustomUGApplicant)
-            if self._reduced_slip():
-                for field in PUTME_OMIT_RESULT_SLIP_FIELDS:
-                    form_fields = form_fields.omit(field)
-        else:
-            form_fields = grok.AutoFields(ICustomUGApplicant)
-            for field in UG_OMIT_PDF_FIELDS:
-                form_fields = form_fields.omit(field)
+        form_fields = grok.AutoFields(ICustomUGApplicant)
         if not getattr(self.context, 'student_id'):
             form_fields = form_fields.omit('student_id')
@@ -157 +121 @@
         if not getattr(self.context, 'screening_date'):
             form_fields = form_fields.omit('screening_date')
-        if not self.context.low_jamb_score:
-            form_fields = form_fields.omit('course2')
         return form_fields
 
@@ -168 +130 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target.startswith('pg'):
-            form_fields = grok.AutoFields(ICustomPGApplicant)
-            for field in PG_OMIT_MANAGE_FIELDS:
-                form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target.startswith('putme'):
-            form_fields = grok.AutoFields(ICustomUGApplicant)
-            for field in PUTME_OMIT_MANAGE_FIELDS:
-                form_fields = form_fields.omit(field)
-        else:
-            form_fields = grok.AutoFields(ICustomUGApplicant)
-            for field in UG_OMIT_MANAGE_FIELDS:
-                form_fields = form_fields.omit(field)
+        form_fields = grok.AutoFields(ICustomUGApplicant)
         form_fields['student_id'].for_display = True
         form_fields['applicant_id'].for_display = True
@@ -223 +174 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target.startswith('pg'):
-            form_fields = grok.AutoFields(ICustomPGApplicantEdit)
-            for field in PG_OMIT_EDIT_FIELDS:
-                form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target.startswith('putme'):
-            form_fields = grok.AutoFields(ICustomUGApplicantEdit)
-            for field in PUTME_OMIT_EDIT_FIELDS:
-                form_fields = form_fields.omit(field)
-        else:
-            form_fields = grok.AutoFields(ICustomUGApplicantEdit)
-            for field in UG_OMIT_EDIT_FIELDS:
-                form_fields = form_fields.omit(field)
+        form_fields = grok.AutoFields(ICustomUGApplicantEdit)
         form_fields['applicant_id'].for_display = True
         form_fields['reg_number'].for_display = True
-        if not self.context.low_jamb_score:
-            form_fields = form_fields.omit('course2')
         return form_fields