mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-11 17:46:20 +01:00
Resolve Dj20 compatibility issues
Temporarily use latest snapshot for esi for dj20
Correct admin urls include
Manually correct old ts3 table migration
Remove obsolete services migrations
Remove bootstrap pagination package
Fix url namespacing
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
from django.db import models
|
||||
from django.contrib.auth.models import User, Group
|
||||
|
||||
|
||||
class Teamspeak3User(models.Model):
|
||||
user = models.OneToOneField('auth.User',
|
||||
user = models.OneToOneField(User,
|
||||
primary_key=True,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='teamspeak3')
|
||||
@@ -30,7 +31,7 @@ class TSgroup(models.Model):
|
||||
|
||||
|
||||
class AuthTS(models.Model):
|
||||
auth_group = models.ForeignKey('auth.Group', on_delete=models.CASCADE)
|
||||
auth_group = models.ForeignKey(Group, on_delete=models.CASCADE)
|
||||
ts_group = models.ManyToManyField(TSgroup)
|
||||
|
||||
class Meta:
|
||||
@@ -41,7 +42,7 @@ class AuthTS(models.Model):
|
||||
|
||||
|
||||
class UserTSgroup(models.Model):
|
||||
user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||
ts_group = models.ManyToManyField(TSgroup)
|
||||
|
||||
class Meta:
|
||||
|
||||
Reference in New Issue
Block a user