Projet

Général

Profil

0001-base-factor-exportable-field-types-40336.patch

Emmanuel Cazenave, 02 mars 2020 16:46

Télécharger (2,39 ko)

Voir les différences:

Subject: [PATCH 1/2] base: factor exportable field types (#40336)

 passerelle/base/models.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
passerelle/base/models.py
45 45
    ('SIGN', _('HMAC Signature')),
46 46
)
47 47

  
48
BASE_EXPORT_FIELDS = (models.TextField, models.CharField, models.SlugField,
49
                      models.URLField, models.BooleanField, models.IntegerField,
50
                      models.CommaSeparatedIntegerField, models.EmailField,
51
                      models.IntegerField, models.PositiveIntegerField, JSONField)
52

  
53

  
48 54
@six.python_2_unicode_compatible
49 55
class ApiUser(models.Model):
50 56
    username = models.CharField(max_length=128,
......
307 313
            if field.name == 'id':
308 314
                continue
309 315
            value = getattr(self, field.attname)
310
            if isinstance(field, (models.TextField, models.CharField, models.SlugField,
311
                                  models.URLField, models.BooleanField, models.IntegerField,
312
                                  models.CommaSeparatedIntegerField, models.EmailField,
313
                                  models.IntegerField, models.PositiveIntegerField, JSONField)):
316
            if isinstance(field, BASE_EXPORT_FIELDS):
314 317
                d[field.name] = value
315 318
            elif isinstance(field, models.FileField):
316 319
                if value:
......
380 383
            if field.name == 'id':
381 384
                continue
382 385
            value = d[field.name]
383
            if isinstance(field, (models.TextField, models.CharField, models.SlugField,
384
                                  models.URLField, models.BooleanField, models.IntegerField,
385
                                  models.CommaSeparatedIntegerField, models.EmailField,
386
                                  models.IntegerField, models.PositiveIntegerField, JSONField)):
386
            if isinstance(field, BASE_EXPORT_FIELDS):
387 387
                setattr(instance, field.attname, value)
388 388
            elif isinstance(field, models.FileField):
389 389
                if value:
390
-