Cambios API Clientes permisos
This commit is contained in:
@@ -12,7 +12,7 @@ class ClientesA24(models.Model):
|
||||
fecha_baja = models.DateField(blank=True,null=True)
|
||||
class Meta:
|
||||
ordering = ('-Activo','RFC',)
|
||||
abstract=True
|
||||
|
||||
def __str__(self):
|
||||
return self.Nombre
|
||||
|
||||
@@ -25,14 +25,14 @@ class Sistemas_por_cliente_A24(models.Model):
|
||||
class Meta:
|
||||
ordering= ('-cliente','id_sistema')
|
||||
unique_together = ('id_sistema', 'cliente')
|
||||
abstract=True
|
||||
|
||||
|
||||
class DeviceA24(models.Model):
|
||||
clienteA24 = models.ForeignKey(ClientesA24,on_delete=models.CASCADE)
|
||||
deviceName = models.CharField(max_length=255)
|
||||
deviceOS = models.CharField(max_length=255)
|
||||
deviceIP = models.GenericIPAddressField()
|
||||
token = models.ForeignKey(Token, on_delete=models.CASCADE,to_field='key', max_length=40, blank=True,null=True)
|
||||
token = models.ForeignKey(Token, on_delete=models.CASCADE, max_length=40, blank=True,null=True)
|
||||
username = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||
sistema = models.ForeignKey(Sistema, on_delete=models.CASCADE)
|
||||
MAC = models.CharField(max_length=30, blank=True, null=True)
|
||||
@@ -41,12 +41,12 @@ class DeviceA24(models.Model):
|
||||
|
||||
class Meta:
|
||||
ordering = ('username',)
|
||||
abstract=True
|
||||
#abstract=True
|
||||
|
||||
|
||||
def generate_username(self):
|
||||
""""""
|
||||
username_ = f"SCAII_{self.clienteA24}_{self.deviceName}_{self.MAC}"
|
||||
def generate_username(self,client, device_name, mac_address):
|
||||
""""""
|
||||
username_ = f"SCAII_{client.RFC}_{device_name}_{mac_address}"
|
||||
username_ = re.sub(r'\W+', '', username_)
|
||||
|
||||
if User.objects.filter(username=username_).exists():
|
||||
@@ -56,7 +56,7 @@ class DeviceA24(models.Model):
|
||||
def save(self,*args, **kwargs):
|
||||
"""Overrides save method"""
|
||||
if not self.pk:
|
||||
obj = self.generate_username()
|
||||
obj = self.generate_username(self.clienteA24, self.deviceName, self.MAC)
|
||||
self.username=obj
|
||||
token, created = Token.objects.get_or_create(user=obj)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user