confirmed at for csv users

This commit is contained in:
alex 2020-01-31 09:03:15 +03:00
parent 982a52ab96
commit c3cc87507e
4 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,23 @@
# Generated by Django 2.2.7 on 2020-01-31 05:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('account', '0033_user_phone'),
]
operations = [
migrations.AddField(
model_name='user',
name='confirmed_at',
field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='confirmed at'),
),
migrations.AlterField(
model_name='role',
name='role',
field=models.PositiveIntegerField(choices=[(1, 'Standard user'), (2, 'Moderator'), (3, 'Country admin'), (4, 'Content page manager'), (5, 'Establishment manager'), (6, 'Review manager'), (7, 'Restaurant inspector'), (8, 'Sales man'), (9, 'Winery and wine inspector'), (10, 'Seller'), (11, 'Distillery & Liquor inspector'), (12, 'Producer food inspector'), (13, 'Establishment administrator'), (14, 'Artisan inspector')], verbose_name='Role'),
),
]

View File

@ -227,6 +227,7 @@ class User(AbstractUser):
null=True, default=None)
unconfirmed_email = models.EmailField(_('unconfirmed email'), blank=True, null=True, default=None)
email_confirmed = models.BooleanField(_('email status'), default=False)
confirmed_at = models.DateTimeField(_('confirmed at'), null=True, blank=True, default=None)
newsletter = models.NullBooleanField(default=True)
old_id = models.IntegerField(null=True, blank=True, default=None)
locale = models.CharField(max_length=10, blank=True, default=None, null=True,
@ -301,6 +302,7 @@ class User(AbstractUser):
self.email = self.unconfirmed_email
self.unconfirmed_email = None
self.email_confirmed = True
self.confirmed_at = datetime.now()
self.save()
def approve(self):

View File

@ -154,6 +154,7 @@ class UserRoleSerializer(serializers.ModelSerializer):
class UserCSVSerializer(serializers.ModelSerializer):
created_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='date_joined')
last_seen_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='last_login')
confirmed_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True,)
country = serializers.CharField(allow_blank=True, allow_null=True, source='country_name')
roles_list = serializers.CharField(allow_blank=True, allow_null=True, source='locale_roles')
@ -165,8 +166,8 @@ class UserCSVSerializer(serializers.ModelSerializer):
'email',
'locale',
'country',
# 'last_country',
'created_at',
'confirmed_at',
'last_seen_at',
'last_ip',
'roles_list',

View File

@ -177,7 +177,7 @@ class UserCSVViewSet(ModelViewSet):
'locale',
'last_country',
'created_at',
# 'confirmed_at',
'confirmed_at',
'last_seen_at',
'last_ip',
'role',