From 3b0c812f77181677cdf3c98892b179081ff42e2c Mon Sep 17 00:00:00 2001 From: Sam Oehlert Date: Thu, 13 Nov 2025 15:46:09 -0600 Subject: [PATCH] fix(add-form): swap permission check and autocreate admin so the add form shows up on initial install right now it also shows up fine if you're already logged in, and does not show up if you are not logged in. Aka it works correctly other than the case this fixes. --- scram/route_manager/views.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/scram/route_manager/views.py b/scram/route_manager/views.py index 13871f9f..a4f6a544 100644 --- a/scram/route_manager/views.py +++ b/scram/route_manager/views.py @@ -37,17 +37,6 @@ def home_page(request, prefilter=None): if not prefilter: prefilter = Entry.objects.all().select_related("actiontype", "route") num_entries = settings.RECENT_LIMIT - if request.user.has_perms(("route_manager.view_entry", "route_manager.add_entry")): - readwrite = True - else: - readwrite = False - context = {"entries": {}, "readwrite": readwrite} - for at in ActionType.objects.all(): - queryset_active = prefilter.filter(actiontype=at, is_active=True).order_by("-pk") - context["entries"][at] = { - "objs": queryset_active[:num_entries], - "active": queryset_active.count(), - } if settings.AUTOCREATE_ADMIN: if User.objects.count() == 0: @@ -66,6 +55,18 @@ def home_page(request, prefilter=None): "You have been logged in as the admin user", ) + if request.user.has_perms(("route_manager.view_entry", "route_manager.add_entry")): + readwrite = True + else: + readwrite = False + context = {"entries": {}, "readwrite": readwrite} + for at in ActionType.objects.all(): + queryset_active = prefilter.filter(actiontype=at, is_active=True).order_by("-pk") + context["entries"][at] = { + "objs": queryset_active[:num_entries], + "active": queryset_active.count(), + } + return render(request, "route_manager/home.html", context)