fixed regression introduced

This commit is contained in:
Sam
2021-02-02 11:46:43 +00:00
parent ec584b7aab
commit c8d433c3f9
20 changed files with 377 additions and 237 deletions

View File

@@ -4,9 +4,8 @@ from django.contrib.auth.models import PermissionsMixin
from companies.models import Company
# Create your models here.
class CustomUserManager(BaseUserManager):
class UserManager(BaseUserManager):
use_in_migrations = True
def _create_user(self, email, password, **extra_fields):
@@ -18,7 +17,7 @@ class CustomUserManager(BaseUserManager):
email = self.normalize_email(email)
user = self.model(email=email, **extra_fields)
user.set_password(password)
user.save()
user.save(using=self._db)
return user
def create_user(self, email, password=None, **extra_fields):
@@ -47,13 +46,13 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
company = models.ForeignKey(Company, null=True, on_delete=models.DO_NOTHING, related_name='custom_user')
is_active = models.BooleanField('Activo', default=False)
is_staff = models.BooleanField('Empleado',default=False)
is_staff = models.BooleanField('Empleado',default=False )
modified = models.DateTimeField(auto_now=True, null=True, blank=True)
created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
last_visit = models.DateTimeField(auto_now=True)
objects = CustomUserManager()
objects = UserManager()
USERNAME_FIELD = 'email'
REQUIRED_FIELDS = []