edit users solved conflicts

This commit is contained in:
Diego Calvo
2021-02-04 12:16:47 +01:00
parent 1bfe41c000
commit 7a7b27cc2b
6 changed files with 53 additions and 20 deletions

View File

@@ -49,7 +49,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
email = models.EmailField('Dirección de email', unique=True)
full_name = models.CharField('Nombre completo', max_length=100, blank=True)
role = models.CharField('Rol', choices=ROLES, default=SHOP_USER, max_length=100, blank=True, null=True)
role = models.CharField('Rol', choices=ROLES, default=SHOP_USER, max_length=100)
notify = models.BooleanField('Notificar', default=False, null=True)
provider = models.CharField('Proveedor', max_length=1000, blank=True, null=True) # red social de registro
email_verified = models.BooleanField('Email verificado', default=False, null=True)