Bernard Siebens
f3b1ae7e82
Finish relocating Member/Family/FamilyMembership from authentication into a dedicated members app, and revert the half-applied move of member names onto the global User. - members: add first_name/last_name back to Member (the whole codebase — tests, CSV importer, club app, admin — assumes them, and login-less children in families need a name); restore local ordering/index and the member__last_name lookups in Family.__str__ and FamilyMembership. - authentication: drop first_name/last_name from User; get_full_name/ get_short_name delegate to the linked member, else fall back to email. - migrations: create members.0001_initial, repoint club.ClubMembership FK (club.0005), delete the models from authentication (0004, rewritten to plain DeleteModel ops in child-first order to avoid a SQLite table-remake crash). - fix stale imports across apps (authentication/club tests, CSV importer) and missing imports/URLs in members tests; add missing _ import in members/admin.py; export MemberCsvImporter from members.services. Full suite green (64 tests), ruff clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
45 lines
1.5 KiB
Python
45 lines
1.5 KiB
Python
from django.contrib import admin
|
|
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
|
|
from django.utils.translation import gettext_lazy as _
|
|
|
|
from members.models import Member
|
|
|
|
from .forms import UserChangeForm, UserCreationForm
|
|
from .models import User
|
|
|
|
|
|
class MemberInline(admin.StackedInline):
|
|
"""Edit the member profile attached to a login from the User page."""
|
|
|
|
model = Member
|
|
can_delete = False
|
|
extra = 0
|
|
max_num = 1
|
|
verbose_name_plural = _("member profile")
|
|
fields = ("first_name", "last_name", "date_of_birth", "email", "phone", "emergency_phone")
|
|
|
|
|
|
@admin.register(User)
|
|
class UserAdmin(BaseUserAdmin):
|
|
add_form = UserCreationForm
|
|
form = UserChangeForm
|
|
model = User
|
|
inlines = [MemberInline]
|
|
|
|
list_display = ("email", "full_name", "is_staff", "is_active")
|
|
list_filter = ("is_staff", "is_superuser", "is_active", "groups")
|
|
search_fields = ("email", "member__first_name", "member__last_name")
|
|
ordering = ("email",)
|
|
readonly_fields = ("last_login",)
|
|
|
|
fieldsets = (
|
|
(None, {"fields": ("email", "password")}),
|
|
(_("Permissions"), {"fields": ("is_active", "is_staff", "is_superuser", "groups", "user_permissions")}),
|
|
(_("Important dates"), {"fields": ("last_login",)}),
|
|
)
|
|
add_fieldsets = ((None, {"classes": ("wide",), "fields": ("email", "password1", "password2")}),)
|
|
|
|
@admin.display(description=_("name"))
|
|
def full_name(self, obj):
|
|
return obj.get_full_name()
|