Changeset 17777


Ignore:
Timestamp:
13 May 2024, 14:59:01 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r17719 r17777  
    256256        if self.target is not None and self.target == 'res':
    257257            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
    258                 'locked', 'suspended')
     258                'locked', 'suspended', 'request_type')
    259259            form_fields['body_address'].custom_widget = BytesDisplayWidget
    260260            return form_fields
     
    377377        if self.target is not None and self.target == 'res':
    378378            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
    379                 'locked', 'suspended')
     379                'locked', 'suspended', 'request_type')
    380380        elif self.target is not None and self.target == 'cert':
    381381            form_fields = grok.AutoFields(ICertificateRequest).omit(
     
    443443            return form_fields
    444444        if self.target is not None and self.target == 'res':
    445             form_fields = grok.AutoFields(IResultReissuanceRequest)
     445            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
     446                'request_type')
    446447            form_fields['applicant_id'].for_display = True
    447448            return form_fields
     
    581582        if self.target is not None and self.target == 'res':
    582583            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
    583                 'locked', 'suspended')
     584                'locked', 'suspended', 'request_type')
    584585            return form_fields
    585586        if self.target is not None and self.target == 'fedex':
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

    r17719 r17777  
    15611561    """
    15621562
    1563     request_type = schema.Choice(
     1563    request_type_2 = schema.Choice(
    15641564        title = _(u'Request Type'),
    15651565        vocabulary = request_types_vocab_2,
    15661566        required = True,
    15671567        )
    1568 IResultReissuanceRequest['request_type'].order = ISendByEmailRequest[
    1569     'request_type'].order
     1568IResultReissuanceRequest['request_type_2'].order = IResultReissuanceRequest[
     1569    'body_email'].order
    15701570
    15711571class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
Note: See TracChangeset for help on using the changeset viewer.