Projet

Général

Profil

0001-cartads-add-abstract-model-class-in-the-middle-31611.patch

Frédéric Péters, 21 mars 2019 09:27

Télécharger (2,12 ko)

Voir les différences:

Subject: [PATCH] cartads: add abstract model class in the middle (#31611)

 passerelle/apps/cartads_cs/models.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
passerelle/apps/cartads_cs/models.py
64 64
    last_update_datetime = models.DateTimeField(auto_now=True)
65 65

  
66 66

  
67
class CartaDSCS(BaseResource):
68
    category = _('Misc')
67
class AbstractCartaDSCS(BaseResource):
69 68

  
70 69
    wsdl_base_url = models.URLField(_('WSDL Base URL'),
71 70
            help_text=_('ex: https://example.net/adscs/webservices/'))
......
79 78
    ftp_client_name = models.CharField(_('FTP Client Name'), max_length=64)
80 79

  
81 80
    class Meta:
82
        verbose_name = 'Cart@DS CS'
81
        # it is abstract to make it possible for an external connector (@GL) to
82
        # reuse the full connector.
83
        abstract = True
83 84

  
84 85
    @property
85 86
    def wsdl_url(self):
......
89 90
        return self.wsdl_base_url + service_type + '.svc?singleWsdl'
90 91

  
91 92
    def soap_client(self, **kwargs):
92
        client = super(CartaDSCS, self).soap_client(**kwargs)
93
        client = super(AbstractCartaDSCS, self).soap_client(**kwargs)
93 94
        # fix URL that should have been changed by reverse proxy
94 95
        parsed_wsdl_address = urlparse.urlparse(client.service._binding_options['address'])
95 96
        parsed_real_address = urlparse.urlparse(self.wsdl_base_url)
......
444 445
            status_id = 'pending'
445 446
            status_label = _('Pending')
446 447
        return {'status_id': status_id, 'status_label': status_label, 'extra': extra}
448

  
449

  
450
class CartaDSCS(AbstractCartaDSCS):
451
    category = _('Misc')
452
    class Meta:
453
        verbose_name = 'Cart@DS CS'
447
-