From 0cab5ee303fe3e8585fe3485c96e512ceb828c35 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 20 Aug 2020 16:12:11 +0200
Subject: [PATCH] Fix request getter in SelectForm
---
aleksis/apps/alsijil/forms.py | 3 ++-
aleksis/apps/alsijil/views.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 61159d1dd..b8198da08 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -4,6 +4,7 @@ from django import forms
from django.core.exceptions import ValidationError
from django.db.models import Count, Q
from django.utils.translation import gettext_lazy as _
+from django_global_request.middleware import get_request
from django_select2.forms import Select2Widget
from guardian.shortcuts import get_objects_for_user
@@ -75,7 +76,7 @@ class SelectForm(forms.Form):
return data
def __init__(self, *args, **kwargs):
- self.request = kwargs["request"]
+ self.request = get_request()
super().__init__(*args, **kwargs)
person = self.request.user.person
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index c9b1877cf..d3b6e79d3 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -206,7 +206,7 @@ def week_view(
initial = {type_.value: instance}
else:
initial = {}
- select_form = SelectForm(request.POST or None, initial=initial, request=request)
+ select_form = SelectForm(request.POST or None, initial=initial)
if request.method == "POST":
if select_form.is_valid():
--
GitLab