Change the code to use the root middleware

matthiask · matthiask · commit 709f58214fcd · 2023-09-27T14:28:17.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: ".yarn/|yarn.lock"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: check-merge-conflict
@@ -16,31 +16,31 @@ repos:
         language: system
         always_run: true
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v3.13.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.4.0
+    rev: 1.15.0
     hooks:
       - id: django-upgrade
         args: [--target-version, "3.2"]
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         args: [--profile=black, --lines-after-imports=2, --combine-as]
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 23.9.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 6.1.0
     hooks:
       - id: flake8
         args: ["--ignore=E203,E501,W503"]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.5.1
+    rev: v3.0.3
     hooks:
       - id: prettier
         args: [--list-different, --no-semi]
diff --git a/app/articles/migrations/0001_initial.py b/app/articles/migrations/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/app/articles/urls.py b/app/articles/urls.py
@@ -1,13 +1,13 @@
-from django.urls import re_path
+from django.urls import path, re_path
 
 from app.articles import views
 
 
 app_name = "articles"
 ignore_app_name_mismatch = True  # It's expected
 urlpatterns = [
-    re_path(
-        r"^$",
+    path(
+        "",
         views.article_list,
         name="article-list",
     ),
diff --git a/app/pages/middleware.py b/app/pages/middleware.py
@@ -1,14 +1,11 @@
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import render
+from feincms3.root.middleware import create_page_if_404_middleware
 
 from .models import Page
 from .renderer import renderer
 
 
-def page_detail(request, path=None):
-    page = get_object_or_404(
-        Page.objects.active(),
-        path=f"/{path}/" if path else "/",
-    )
+def handler(request, page):
     page.activate_language(request)
     return render(
         request,
@@ -22,3 +19,8 @@ def page_detail(request, path=None):
             ),
         },
     )
+
+
+page_if_404_middleware = create_page_if_404_middleware(
+    queryset=lambda request: Page.objects.active(), handler=handler
+)
diff --git a/app/pages/migrations/0001_initial.py b/app/pages/migrations/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/app/pages/urls.py b/app/pages/urls.py
diff --git a/app/settings.py b/app/settings.py
@@ -61,6 +61,7 @@
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "feincms3.applications.apps_middleware",
+    "app.pages.middleware.page_if_404_middleware",
 ]
 
 ROOT_URLCONF = "app.urls"
diff --git a/app/urls.py b/app/urls.py
@@ -1,10 +1,8 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import include, re_path
+from django.urls import path
 
 
-urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT,) + [
-    re_path(r"^admin/", admin.site.urls),
-    re_path(r"", include("app.pages.urls")),
-]
+urlpatterns = [path("admin/", admin.site.urls)]
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@`
`61`	`61`	`"django.contrib.messages.middleware.MessageMiddleware",`
`62`	`62`	`"django.middleware.clickjacking.XFrameOptionsMiddleware",`
`63`	`63`	`"feincms3.applications.apps_middleware",`
	`64`	`+ "app.pages.middleware.page_if_404_middleware",`
`64`	`65`	`]`
`65`	`66`
`66`	`67`	`ROOT_URLCONF = "app.urls"`