From 3cd0aa39326dc7a01f57ae9e8861f671c9be537d Mon Sep 17 00:00:00 2001
From: bronsen <kontakt+gitcommit@nrrd.de>
Date: Sat, 15 Mar 2025 13:26:43 +0100
Subject: [PATCH] [collector] rename Views and urls
---
collector/urls.py | 4 ++--
collector/views.py | 21 ++++++++++++++++++---
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/collector/urls.py b/collector/urls.py
index d12fc75..4b1c7bb 100644
--- a/collector/urls.py
+++ b/collector/urls.py
@@ -5,8 +5,8 @@ from . import views
app_name = "collector"
urlpatterns = [
- path("", views.IndexView.as_view(), name="index"),
+ path("", views.IndexView.as_view(), name="list"),
path("recorded/<int:pk>/", views.DetailView.as_view(), name="detail"),
path("enter/", views.enter, name="enter"),
- path("all/", views.ListView.as_view(), name="all"),
+ path("all/", views.TeileListView.as_view(), name="list-all"),
]
diff --git a/collector/views.py b/collector/views.py
index b77979a..cc6023d 100644
--- a/collector/views.py
+++ b/collector/views.py
@@ -1,4 +1,5 @@
import logging
+from typing import Any
from django.db import transaction
from django.db.models import QuerySet
@@ -11,15 +12,23 @@ from .models import Teil
logger = logging.getLogger(__name__)
-class ListView(generic.ListView):
+DEFAULT_TEILE_NUMBER = 10
+
+class TeileListView(generic.ListView):
template_name = "collector/index.html"
context_object_name = "teile_list"
def get_queryset(self) -> QuerySet:
return Teil.objects.order_by("-modified")
+ def get_context_data(self, **kwargs) -> dict[str, Any]:
+ context = super().get_context_data(**kwargs)
+ context["default_teile_number"] = DEFAULT_TEILE_NUMBER
-class IndexView(ListView):
+ return context
+
+
+class IndexView(TeileListView):
def get_queryset(self) -> QuerySet:
return super().get_queryset()[:10]
@@ -28,6 +37,12 @@ class DetailView(generic.DetailView):
model = Teil
template_name = "collector/detail.html"
+ def get_context_data(self, **kwargs) -> dict[str, Any]:
+ context = super().get_context_data(**kwargs)
+ context["default_teile_number"] = DEFAULT_TEILE_NUMBER
+
+ return context
+
def enter(request: HttpRequest) -> HttpResponse:
try:
@@ -36,4 +51,4 @@ def enter(request: HttpRequest) -> HttpResponse:
except Exception:
logger.warning("Teil already existed")
- return HttpResponseRedirect(reverse("collector:index"))
+ return HttpResponseRedirect(reverse("collector:list"))