Changeset 15588

Timestamp:

17 Sep 2019, 18:27:50 (5 years ago)

Author:

Henrik Bettermann

Message:

Enable application slip for special applications.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/interfaces.py (modified) (1 diff)
• applicants/viewlets.py (modified) (1 diff)
• permissions.py (modified) (1 diff)

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

@@ -203 +203 @@
     @property
     def note(self):
+        if self.context.special:
+            return
         note = getattr(self.context.__parent__, 'application_slip_notice', None)
         if note:
@@ -232 +234 @@
     @property
     def form_fields(self):
-        if self.target == 'conv':
+        if self.target in ('conv', 'special'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
-                'special_application', 'carryover_courses',
-                'locked', 'suspended')
+                'special_application',
+                'locked', 'suspended', 'applicant_id')
+            if not self.context.carryover_courses:
+                form_fields = form_fields.omit('carryover_courses')
             return form_fields
         form_fields = grok.AutoFields(ICustomUGApplicant)

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

@@ -289 +289 @@
 class ICustomSpecialApplicant(ISpecialApplicant):
 
+    department = schema.TextLine(
+        title = _(u'Department'),
+        required = True,
+        readonly = False,
+        )
+
+    grad_year = schema.Choice(
+        title = _(u'Year of Graduation'),
+        required = True,
+        values = grad_year_range(),
+        readonly = False,
+        )
+
     carryover_courses = schema.Text(
         title = _(u'Carry-Over Courses'),
         required = False,
-        description = _(
-            u'Enter course titles if carry-over remedial payment.'),
-        )
-
-    department = schema.TextLine(
-        title = _(u'Department'),
-        required = True,
-        readonly = False,
-        )
-
-    grad_year = schema.Choice(
-        title = _(u'Year of Graduation'),
-        required = True,
-        values = grad_year_range(),
-        readonly = False,
-        )
-
+        #description = _(
+        #    u'Enter course titles if carry-over remedial payment.'),
+        )
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
                        ICustomSpecialApplicant):

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/viewlets.py

@@ -29 +29 @@
         """Get a URL to the target...
         """
-        if self.context.state in ('initialized', 'started', 'paid') \
-            or self.context.special:
+        if self.context.state in ('initialized', 'started', 'paid'):
             return
         if self.context.__parent__.prefix == 'conv':

main/kofacustom.dspg/trunk/src/kofacustom/dspg/permissions.py

@@ -23 +23 @@
     """ Permissions of Computer Center members.
 
-    This is basically a copy of the the PortalManager. We exclude some
+    This is basically a copy of the PortalManager. We exclude some
     permissions by commenting them out.
     """