Changeset 17777

Timestamp:

13 May 2024, 14:59:01 (6 months ago)

Author:

Henrik Bettermann

Message:

send and res applications were using the same interface (field definitions) but res applications have different set of request types.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

• browser.py (modified) (4 diffs)
• interfaces.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

@@ -256 +256 @@
         if self.target is not None and self.target == 'res':
             form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
-                'locked', 'suspended')
+                'locked', 'suspended', 'request_type')
             form_fields['body_address'].custom_widget = BytesDisplayWidget
             return form_fields
@@ -377 +377 @@
         if self.target is not None and self.target == 'res':
             form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
-                'locked', 'suspended')
+                'locked', 'suspended', 'request_type')
         elif self.target is not None and self.target == 'cert':
             form_fields = grok.AutoFields(ICertificateRequest).omit(
@@ -443 +443 @@
             return form_fields
         if self.target is not None and self.target == 'res':
-            form_fields = grok.AutoFields(IResultReissuanceRequest)
+            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
+                'request_type')
             form_fields['applicant_id'].for_display = True
             return form_fields
@@ -581 +582 @@
         if self.target is not None and self.target == 'res':
             form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
-                'locked', 'suspended')
+                'locked', 'suspended', 'request_type')
             return form_fields
         if self.target is not None and self.target == 'fedex':

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -1561 +1561 @@
     """
 
-    request_type = schema.Choice(
+    request_type_2 = schema.Choice(
         title = _(u'Request Type'),
         vocabulary = request_types_vocab_2,
         required = True,
         )
-IResultReissuanceRequest['request_type'].order = ISendByEmailRequest[
-    'request_type'].order
+IResultReissuanceRequest['request_type_2'].order = IResultReissuanceRequest[
+    'body_email'].order
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,