Skip to content

Commit 0d9f10d

Browse files
authored
fix(add-form): swap permission check and autocreate admin (#179)
2 parents dce703c + 3b0c812 commit 0d9f10d

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

scram/route_manager/views.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ def home_page(request, prefilter=None):
3737
if not prefilter:
3838
prefilter = Entry.objects.all().select_related("actiontype", "route")
3939
num_entries = settings.RECENT_LIMIT
40-
if request.user.has_perms(("route_manager.view_entry", "route_manager.add_entry")):
41-
readwrite = True
42-
else:
43-
readwrite = False
44-
context = {"entries": {}, "readwrite": readwrite}
45-
for at in ActionType.objects.all():
46-
queryset_active = prefilter.filter(actiontype=at, is_active=True).order_by("-pk")
47-
context["entries"][at] = {
48-
"objs": queryset_active[:num_entries],
49-
"active": queryset_active.count(),
50-
}
5140

5241
if settings.AUTOCREATE_ADMIN:
5342
if User.objects.count() == 0:
@@ -66,6 +55,18 @@ def home_page(request, prefilter=None):
6655
"You have been logged in as the admin user",
6756
)
6857

58+
if request.user.has_perms(("route_manager.view_entry", "route_manager.add_entry")):
59+
readwrite = True
60+
else:
61+
readwrite = False
62+
context = {"entries": {}, "readwrite": readwrite}
63+
for at in ActionType.objects.all():
64+
queryset_active = prefilter.filter(actiontype=at, is_active=True).order_by("-pk")
65+
context["entries"][at] = {
66+
"objs": queryset_active[:num_entries],
67+
"active": queryset_active.count(),
68+
}
69+
6970
return render(request, "route_manager/home.html", context)
7071

7172

0 commit comments

Comments
 (0)