Hexor/OutFleet
1
0
Fork 0
mirror of https://github.com/house-of-vanity/OutFleet.git synced 2025-07-07 01:24:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge vpn.Users with Django Users

Browse Source
This commit is contained in:
A B
2024-10-27 01:06:37 +00:00
parent dda9b4ba5a
commit d324edec69
7 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vpn/models.py
View File

@ -6,8 +6,12 @@ from django.dispatch import receiver
from .server_plugins import Server
import shortuuid
class User(models.Model):
name = models.CharField(max_length=100)
from django.contrib.auth.models import AbstractUser
class User(AbstractUser):
#username = models.CharField(max_length=100)
is_active = False
comment = models.TextField(default="", blank=True)
registration_date = models.DateTimeField(auto_now_add=True)
servers = models.ManyToManyField('Server', through='ACL', blank=True)
@ -23,7 +27,7 @@ class User(models.Model):
super().save(*args, **kwargs)
def __str__(self):
return self.name
return self.username
class ACL(models.Model):
@ -39,7 +43,7 @@ class ACL(models.Model):
def __str__(self):
return f"{self.user.name} - {self.server.name}"
return f"{self.user.username} - {self.server.name}"
def save(self, *args, **kwargs):
if not self.link: