From 01eb3520f6d03bcc1a3758e2014de2538c29733a Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 11 Mar 2023 15:59:53 +0100 Subject: [PATCH] Link MailAlias to Logins instead of Users --- src/users/admin.py | 10 +++++----- src/users/models/mailalias.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/users/admin.py b/src/users/admin.py index 25c9915..8152570 100644 --- a/src/users/admin.py +++ b/src/users/admin.py @@ -31,15 +31,15 @@ class MailAliasInLine(admin.StackedInline): class LoginAdmin(admin.ModelAdmin): list_display = ("login", "enabled") - inlines = (GroupInLine,) + inlines = ( + GroupInLine, + MailAliasInLine, + ) class UserAdmin(admin.ModelAdmin): list_display = ("name", "customer") - inlines = ( - MailAliasInLine, - LicenseWithUserInLine, - ) + inlines = (LicenseWithUserInLine,) admin.site.register(Group) diff --git a/src/users/models/mailalias.py b/src/users/models/mailalias.py index a7f2d6b..71309d7 100644 --- a/src/users/models/mailalias.py +++ b/src/users/models/mailalias.py @@ -1,10 +1,10 @@ from django.db import models -from users.models import User +from users.models import Login class MailAlias(models.Model): email_address = models.EmailField() - user = models.ForeignKey(User, on_delete=models.CASCADE) + login = models.ForeignKey(Login, on_delete=models.CASCADE) def __str__(self): return self.email_address