Adjust ACLLinks length. Added links generator
Some checks failed
Docker hub build / docker (push) Has been cancelled

This commit is contained in:
A B
2024-11-18 20:34:54 +00:00
parent a8ddadbe6d
commit a790da0793
4 changed files with 71 additions and 4 deletions

View File

@@ -11,6 +11,7 @@ from .models import User, AccessLog
from django.utils.timezone import localtime
from vpn.models import User, ACL, ACLLink
from vpn.forms import UserForm
from mysite.settings import EXTERNAL_ADDRESS
from .server_plugins import (
Server,
WireguardServer,
@@ -164,8 +165,9 @@ class ACLAdmin(admin.ModelAdmin):
except Exception as e:
return mark_safe(f"<span style='color: red;'>Error: {e}</span>")
@admin.display(description='Links')
@admin.display(description='Dynamic Config Links')
def display_links(self, obj):
links = obj.links.all()
return mark_safe('<br>'.join([link.link for link in links]))
formatted_links = [f"{EXTERNAL_ADDRESS}/{link.link}" for link in links]
return mark_safe('<br>'.join(formatted_links))

View File

@@ -67,7 +67,7 @@ def acl_deleted(sender, instance, **kwargs):
class ACLLink(models.Model):
acl = models.ForeignKey(ACL, related_name='links', on_delete=models.CASCADE)
link = models.CharField(max_length=64, default="", unique=True, blank=True, null=True, verbose_name="Access link", help_text="Access link to get dynamic configuration")
link = models.CharField(max_length=1024, default="", unique=True, blank=True, null=True, verbose_name="Access link", help_text="Access link to get dynamic configuration")
def save(self, *args, **kwargs):
if self.link == "":