Private
Public Access
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90837b339c |
No files matched your search
+15
-5
@@ -1,18 +1,28 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.shortcuts import redirect
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
from .models import SiteSettings
|
from .models import SiteSettings
|
||||||
|
|
||||||
|
|
||||||
@admin.register(SiteSettings)
|
@admin.register(SiteSettings)
|
||||||
class SiteSettingsAdmin(admin.ModelAdmin):
|
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"]
|
fields = ["fetch_interval_minutes"]
|
||||||
|
|
||||||
def has_add_permission(self, request):
|
def has_add_permission(self, request):
|
||||||
# Singleton — only offer "Add" when the row doesn't exist yet
|
return False
|
||||||
# (a fresh install before the first poll_due_feeds run or admin
|
|
||||||
# visit has created it via SiteSettings.load()).
|
|
||||||
return not SiteSettings.objects.exists()
|
|
||||||
|
|
||||||
def has_delete_permission(self, request, obj=None):
|
def has_delete_permission(self, request, obj=None):
|
||||||
return False
|
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)
|
||||||
@@ -51,7 +51,21 @@ def test_poll_due_feeds_uses_the_site_wide_interval_for_every_feed():
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@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
|
# ModelAdmin.has_add_permission/has_delete_permission returning False
|
||||||
# makes Django raise PermissionDenied rather than build a 403 response
|
# makes Django raise PermissionDenied rather than build a 403 response
|
||||||
# directly — the test client's default behavior re-raises that for
|
# 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")
|
User.objects.create_superuser("admin", password="pw-admin-123")
|
||||||
client.login(username="admin", password="pw-admin-123")
|
client.login(username="admin", password="pw-admin-123")
|
||||||
|
|
||||||
add_url = reverse("admin:core_sitesettings_add")
|
response = client.get(reverse("admin:core_sitesettings_add"))
|
||||||
response = client.get(add_url)
|
assert response.status_code == 403
|
||||||
assert response.status_code == 200 # no row yet — "Add" is offered
|
|
||||||
|
|
||||||
settings_row = SiteSettings.load()
|
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])
|
delete_url = reverse("admin:core_sitesettings_delete", args=[settings_row.pk])
|
||||||
response = client.get(delete_url)
|
response = client.get(delete_url)
|
||||||
assert response.status_code == 403
|
assert response.status_code == 403
|
||||||
Reference in new issue
Block a user