From 234ed5b98f74651b40e7836f8ec198f36122e84f Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Wed, 18 Nov 2026 16:11:10 +0100 Subject: [PATCH 1/4] Add an admin for domain checks --- domains/admin.py | 20 +++++++++++++++++++- domains/tests/test_admin.py | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/domains/admin.py b/domains/admin.py index 21366088..d054aa80 100644 --- a/domains/admin.py +++ b/domains/admin.py @@ -2,7 +2,7 @@ from abstract.admin import TimeStampedAdminMixin -from .models import Domain +from .models import Domain, DomainCheck @admin.register(Domain) @@ -28,3 +28,21 @@ class DomainAdmin(TimeStampedAdminMixin, admin.ModelAdmin): ] search_fields = ["name", "org__slug"] autocomplete_fields = ["org", "dkim_key_rsa2048", "dkim_key_ed25519"] + + +@admin.register(DomainCheck) +class DomainCheckAdmin(TimeStampedAdminMixin, admin.ModelAdmin): + list_display = [ + "name", + "status", + "penalty", + "modified_at", + "created_at", + ] + list_filter = ["status"] + search_fields = ["name"] + readonly_fields = ["name", "status", "penalty", "checks"] + + def has_add_permission(self, request): + """Rows come from the public checker, which also queues the check.""" + return False diff --git a/domains/tests/test_admin.py b/domains/tests/test_admin.py index bd78ac32..eb4ca633 100644 --- a/domains/tests/test_admin.py +++ b/domains/tests/test_admin.py @@ -2,8 +2,8 @@ from django.contrib import admin from django.urls import reverse -from domains.admin import DomainAdmin -from domains.models import Domain +from domains.admin import DomainAdmin, DomainCheckAdmin +from domains.models import Domain, DomainCheck class TestDomainAdmin: @@ -32,3 +32,34 @@ def test_domain_admin__changelist_search_by_org_slug(self, client, admin_user, o assert response.status_code == 200 assert domain in response.context["cl"].result_list + + +class TestDomainCheckAdmin: + def test_domain_check_admin__registered(self): + assert isinstance(admin.site._registry[DomainCheck], DomainCheckAdmin) + + def test_domain_check_admin__readonly_generated_fields(self): + assert "checks" in DomainCheckAdmin.readonly_fields + assert "status" in DomainCheckAdmin.readonly_fields + assert "penalty" in DomainCheckAdmin.readonly_fields + + def test_has_add_permission__denied(self, rf): + model_admin = admin.site._registry[DomainCheck] + assert model_admin.has_add_permission(rf.get("/admin/")) is False + + @pytest.mark.django_db + def test_delete_selected__deletes_domain_check(self, client, admin_user): + domain_check = DomainCheck.objects.create(name="example.com") + client.force_login(admin_user) + + response = client.post( + reverse("admin:domains_domaincheck_changelist"), + { + "action": "delete_selected", + "_selected_action": [domain_check.pk], + "post": "yes", + }, + ) + + assert response.status_code == 302 + assert not DomainCheck.objects.filter(pk=domain_check.pk).exists() From 6d0ea01bc36aef588a25d569f0b61babce8f2346 Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Wed, 18 Nov 2026 16:12:16 +0100 Subject: [PATCH 2/4] Reuse timestamp columns in admin list display --- abstract/admin.py | 7 +++++++ abstract/tests/test_admin.py | 13 +++++++++++++ domains/admin.py | 8 +------- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/abstract/admin.py b/abstract/admin.py index cbb55223..06e76610 100644 --- a/abstract/admin.py +++ b/abstract/admin.py @@ -1,5 +1,6 @@ class TimeStampedAdminMixin: readonly_fields = ["modified_at", "created_at"] + list_display = ["modified_at", "created_at"] list_filter = ["modified_at", "created_at"] def __init_subclass__(cls, **kwargs): @@ -9,3 +10,9 @@ def __init_subclass__(cls, **kwargs): mixin_attr = TimeStampedAdminMixin.__dict__.get(attr, []) merged = [*mixin_attr, *(f for f in cls_attr if f not in mixin_attr)] setattr(cls, attr, merged) + + # Append the timestamps so the subclass keeps the first column, which + # Django links to the change form. + columns = list(getattr(cls, "list_display", [])) + columns += [f for f in TimeStampedAdminMixin.list_display if f not in columns] + cls.list_display = columns diff --git a/abstract/tests/test_admin.py b/abstract/tests/test_admin.py index 798ba053..8e64f2c4 100644 --- a/abstract/tests/test_admin.py +++ b/abstract/tests/test_admin.py @@ -20,6 +20,19 @@ class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): assert "created_at" in MyAdmin.list_filter assert "my_filter" in MyAdmin.list_filter + def test_merges_list_display(self): + class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): + list_display = ["my_field"] + + assert MyAdmin.list_display == ["my_field", "modified_at", "created_at"] + + def test_keeps_first_list_display_field(self): + class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): + list_display = ["my_field", "created_at"] + + assert MyAdmin.list_display[0] == "my_field" + assert MyAdmin.list_display.count("created_at") == 1 + def test_no_duplicate_fields(self): class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): readonly_fields = ["modified_at", "my_field"] diff --git a/domains/admin.py b/domains/admin.py index d054aa80..9560836b 100644 --- a/domains/admin.py +++ b/domains/admin.py @@ -32,13 +32,7 @@ class DomainAdmin(TimeStampedAdminMixin, admin.ModelAdmin): @admin.register(DomainCheck) class DomainCheckAdmin(TimeStampedAdminMixin, admin.ModelAdmin): - list_display = [ - "name", - "status", - "penalty", - "modified_at", - "created_at", - ] + list_display = ["name", "status", "penalty"] list_filter = ["status"] search_fields = ["name"] readonly_fields = ["name", "status", "penalty", "checks"] From 6423a4cc6d486f6b5d47b8bd76abfcc6f734c9a3 Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Wed, 18 Nov 2026 16:12:56 +0100 Subject: [PATCH 3/4] Reuse timestamp list display without merging --- abstract/admin.py | 6 ------ abstract/tests/test_admin.py | 13 ------------- domains/admin.py | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/abstract/admin.py b/abstract/admin.py index 06e76610..0946393e 100644 --- a/abstract/admin.py +++ b/abstract/admin.py @@ -10,9 +10,3 @@ def __init_subclass__(cls, **kwargs): mixin_attr = TimeStampedAdminMixin.__dict__.get(attr, []) merged = [*mixin_attr, *(f for f in cls_attr if f not in mixin_attr)] setattr(cls, attr, merged) - - # Append the timestamps so the subclass keeps the first column, which - # Django links to the change form. - columns = list(getattr(cls, "list_display", [])) - columns += [f for f in TimeStampedAdminMixin.list_display if f not in columns] - cls.list_display = columns diff --git a/abstract/tests/test_admin.py b/abstract/tests/test_admin.py index 8e64f2c4..798ba053 100644 --- a/abstract/tests/test_admin.py +++ b/abstract/tests/test_admin.py @@ -20,19 +20,6 @@ class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): assert "created_at" in MyAdmin.list_filter assert "my_filter" in MyAdmin.list_filter - def test_merges_list_display(self): - class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): - list_display = ["my_field"] - - assert MyAdmin.list_display == ["my_field", "modified_at", "created_at"] - - def test_keeps_first_list_display_field(self): - class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): - list_display = ["my_field", "created_at"] - - assert MyAdmin.list_display[0] == "my_field" - assert MyAdmin.list_display.count("created_at") == 1 - def test_no_duplicate_fields(self): class MyAdmin(TimeStampedAdminMixin, admin.ModelAdmin): readonly_fields = ["modified_at", "my_field"] diff --git a/domains/admin.py b/domains/admin.py index 9560836b..17afeb43 100644 --- a/domains/admin.py +++ b/domains/admin.py @@ -32,7 +32,7 @@ class DomainAdmin(TimeStampedAdminMixin, admin.ModelAdmin): @admin.register(DomainCheck) class DomainCheckAdmin(TimeStampedAdminMixin, admin.ModelAdmin): - list_display = ["name", "status", "penalty"] + list_display = ["name", "status", "penalty", *TimeStampedAdminMixin.list_display] list_filter = ["status"] search_fields = ["name"] readonly_fields = ["name", "status", "penalty", "checks"] From d683adcced828cab733ff9bbbd7903d7e7a75fc8 Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Wed, 18 Nov 2026 16:13:18 +0100 Subject: [PATCH 4/4] Restore explicit timestamp columns --- abstract/admin.py | 1 - domains/admin.py | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/abstract/admin.py b/abstract/admin.py index 0946393e..cbb55223 100644 --- a/abstract/admin.py +++ b/abstract/admin.py @@ -1,6 +1,5 @@ class TimeStampedAdminMixin: readonly_fields = ["modified_at", "created_at"] - list_display = ["modified_at", "created_at"] list_filter = ["modified_at", "created_at"] def __init_subclass__(cls, **kwargs): diff --git a/domains/admin.py b/domains/admin.py index 17afeb43..d054aa80 100644 --- a/domains/admin.py +++ b/domains/admin.py @@ -32,7 +32,13 @@ class DomainAdmin(TimeStampedAdminMixin, admin.ModelAdmin): @admin.register(DomainCheck) class DomainCheckAdmin(TimeStampedAdminMixin, admin.ModelAdmin): - list_display = ["name", "status", "penalty", *TimeStampedAdminMixin.list_display] + list_display = [ + "name", + "status", + "penalty", + "modified_at", + "created_at", + ] list_filter = ["status"] search_fields = ["name"] readonly_fields = ["name", "status", "penalty", "checks"]