From 90837b339ccc2be2062c6c8321758450239ac037 Mon Sep 17 00:00:00 2001 From: Keith Smith Date: Sat, 31 Oct 2026 13:23:47 -0600 Subject: [PATCH] Make the Site settings admin page go straight to the edit form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's a true singleton, not a collection, so the normal changelist (an "Add" link, a list with 0 or 1 rows, an extra click to get to the one row) was just friction — and visually inconsistent with every other app's admin section, which do show an "Add" link. The changelist view now redirects straight to the single row's change form (creating it first if this is a fresh install), and "Add" is never offered at all. Co-Authored-By: Claude Sonnet 5 --- apps/core/admin.py | 20 +++++++++++++++----- apps/core/test_site_settings.py | 24 +++++++++++++++++------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/apps/core/admin.py b/apps/core/admin.py index 78fdcab..bfa42c6 100644 --- a/apps/core/admin.py +++ b/apps/core/admin.py @@ -1,18 +1,28 @@ from django.contrib import admin +from django.shortcuts import redirect +from django.urls import reverse from .models import SiteSettings @admin.register(SiteSettings) class SiteSettingsAdmin(admin.ModelAdmin): - list_display = ["fetch_interval_minutes"] + """A true singleton, not a collection — browsing a changelist to pick + the one row and click into it is an extra, pointless step, so + "Core > Site settings" in the sidebar goes straight to the (only) + change form instead, creating the row first if this is a fresh + install. No changelist/add/delete views exist at all here. + """ + fields = ["fetch_interval_minutes"] def has_add_permission(self, request): - # Singleton — only offer "Add" when the row doesn't exist yet - # (a fresh install before the first poll_due_feeds run or admin - # visit has created it via SiteSettings.load()). - return not SiteSettings.objects.exists() + return False def has_delete_permission(self, request, obj=None): return False + + def changelist_view(self, request, extra_context=None): + settings_row = SiteSettings.load() + url = reverse("admin:core_sitesettings_change", args=[settings_row.pk]) + return redirect(url) diff --git a/apps/core/test_site_settings.py b/apps/core/test_site_settings.py index e40adee..5141ac4 100644 --- a/apps/core/test_site_settings.py +++ b/apps/core/test_site_settings.py @@ -51,7 +51,21 @@ def test_poll_due_feeds_uses_the_site_wide_interval_for_every_feed(): @pytest.mark.django_db -def test_admin_offers_add_only_once_and_never_offers_delete(client): +def test_admin_changelist_redirects_straight_to_the_change_form(client): + assert not SiteSettings.objects.exists() + User.objects.create_superuser("admin", password="pw-admin-123") + client.login(username="admin", password="pw-admin-123") + + changelist_url = reverse("admin:core_sitesettings_changelist") + response = client.get(changelist_url) + + settings_row = SiteSettings.objects.get() # created by the redirect itself + assert response.status_code == 302 + assert response.url == reverse("admin:core_sitesettings_change", args=[settings_row.pk]) + + +@pytest.mark.django_db +def test_admin_never_offers_add_or_delete(client): # ModelAdmin.has_add_permission/has_delete_permission returning False # makes Django raise PermissionDenied rather than build a 403 response # directly — the test client's default behavior re-raises that for @@ -61,14 +75,10 @@ def test_admin_offers_add_only_once_and_never_offers_delete(client): User.objects.create_superuser("admin", password="pw-admin-123") client.login(username="admin", password="pw-admin-123") - add_url = reverse("admin:core_sitesettings_add") - response = client.get(add_url) - assert response.status_code == 200 # no row yet — "Add" is offered + response = client.get(reverse("admin:core_sitesettings_add")) + assert response.status_code == 403 settings_row = SiteSettings.load() - response = client.get(add_url) - assert response.status_code == 403 # a row exists now — add is refused - delete_url = reverse("admin:core_sitesettings_delete", args=[settings_row.pk]) response = client.get(delete_url) assert response.status_code == 403