0001-custom_user-add-field-to-store-user-deactivation-tim.patch

Serghei Mihai (congés, retour 15/05), 09 février 2021 11:40

Voir les différences: en ligne côte à côte

Subject: [PATCH] custom_user: add field to store user deactivation time
 (#50966)

 src/authentic2/admin.py                       | 12 +++++++++--
 .../0025_user_deactivation_datetime.py        | 20 +++++++++++++++++++
 src/authentic2/custom_user/models.py          | 13 ++++++++++--
 tests/test_all.py                             |  1 +
 tests/test_api.py                             |  6 ++++--
 5 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 src/authentic2/custom_user/migrations/0025_user_deactivation_datetime.py

             (_('Personal info'), {'fields': ('username', 'first_name', 'last_name', 'email')}),
             (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
                                            'groups')}),
             (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
             (_('Important dates'), {'fields': ('last_login', 'date_joined', 'deactivation_datetime')}),
+        )
         add_fieldsets = (
             (None, {
-...
         readonly_fields = ('uuid',)
         list_filter = UserAdmin.list_filter + (UserRealmListFilter, ExternalUserListFilter) + ('deleted',)
         list_display = ['__str__', 'ou', 'first_name', 'last_name', 'email', 'deleted']
         actions = UserAdmin.actions + ['mark_as_deleted', 'unmark_as_deleted', 'apply_deletion']
         actions = UserAdmin.actions + ['mark_as_inactive', 'mark_as_deleted',
                                        'unmark_as_deleted', 'apply_deletion']
         def get_fieldsets(self, request, obj=None):
             fieldsets = deepcopy(super(AuthenticUserAdmin, self).get_fieldsets(request, obj))
-...
             kwargs['fields'] = fields
             return super(AuthenticUserAdmin, self).get_form(request, obj=obj, **kwargs)
         @transaction.atomic
         def mark_as_inactive(self, request, queryset):
             timestamp = timezone.now()
             for user in queryset:
                 user.mark_as_inactive(timestamp=timestamp)
         mark_as_inactive.short_description = _('Mark as inactive')
         @transaction.atomic
         def mark_as_deleted(self, request, queryset):
             timestamp = timezone.now()

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.29 on 2021-02-09 09:37
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('custom_user', '0024_index_email_by_trigrams'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='user',
                 name='deactivation_datetime',
                 field=models.DateTimeField(blank=True, null=True, verbose_name='Deactivation datetime'),
             ),
+        ]

             verbose_name=_('Deletion date'),
             null=True,
             blank=True)
         deactivation_datetime = models.DateTimeField(
             verbose_name=_('Deactivation datetime'),
             null=True,
             blank=True)
         objects = UserManager.from_queryset(UserQuerySet)()
         attributes = AttributesDescriptor()
-...
                 del self._a2_attributes_cache
             return super(User, self).refresh_from_db(*args, **kwargs)
         def mark_as_deleted(self, timestamp=None, force=True, save=True):
         def mark_as_inactive(self, timestamp=None):
             self.is_active = False
             self.deactivation_datetime = timestamp or timezone.now()
             self.save(update_fields=['is_active', 'deactivation_datetime'])
         def mark_as_deleted(self, timestamp=None, force=True, save=True):
             self.mark_as_inactive(timestamp)
             if force or not self.deleted:
                 self.deleted = timestamp or timezone.now()
             if save:
                 self.save(update_fields=['is_active', 'deleted'])
                 self.save(update_fields=['deleted'])
         def set_random_password(self):
             self.set_password(base64.b64encode(os.urandom(32)).decode('ascii'))

tests/test_all.py
92	92	'password': '',
93	93	'ou': None,
94	94	'deleted': None,
	95	'deactivation_datetime': None,
95	96	}
96	97	},
97	98	{

                         'last_name_verified', 'date_joined', 'last_login',
                         'username', 'password', 'email', 'is_active', 'title',
                         'title_verified', 'modified', 'email_verified',
                         'last_account_deletion_alert', 'deleted']) == set(resp.json.keys())
                         'last_account_deletion_alert', 'deleted',
                         'deactivation_datetime']) == set(resp.json.keys())
             assert resp.json['first_name'] == payload['first_name']
             assert resp.json['last_name'] == payload['last_name']
             assert resp.json['email'] == payload['email']
-...
                         'last_name_verified', 'date_joined', 'last_login',
                         'username', 'password', 'email', 'is_active', 'title',
                         'title_verified', 'modified', 'email_verified',
                         'last_account_deletion_alert', 'deleted']) == set(resp.json.keys())
                         'last_account_deletion_alert', 'deleted',
                         'deactivation_datetime']) == set(resp.json.keys())
             user = get_user_model().objects.get(pk=resp.json['id'])
             assert AttributeValue.objects.with_owner(user).filter(verified=True).count() == 3
             assert AttributeValue.objects.with_owner(user).filter(verified=False).count() == 0
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-custom_user-add-field-to-store-user-deactivation-tim.patch