From 54ad1253520d510cf0b70b07fe7fb0d18d815671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= <felix@thegcat.net>
Date: Thu, 9 Feb 2023 09:02:10 +0100
Subject: [PATCH] Adapt Settings code to match documentation
https://docs.pretix.eu/en/latest/development/api/customview.html?highlight=permission#event-settings-view
---
pretix_matrix_inviter/forms.py | 2 +-
pretix_matrix_inviter/signals.py | 2 +-
.../templates/pretix_matrix_inviter/settings.html | 2 +-
pretix_matrix_inviter/urls.py | 4 ++--
pretix_matrix_inviter/views.py | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pretix_matrix_inviter/forms.py b/pretix_matrix_inviter/forms.py
index 37a139d..ce4def8 100644
--- a/pretix_matrix_inviter/forms.py
+++ b/pretix_matrix_inviter/forms.py
@@ -11,7 +11,7 @@ from pretix.base.forms import SettingsForm
from .helpers import matrix_room_info_for_event
-class MatrixInviterForm(SettingsForm):
+class MatrixInviterSettingsForm(SettingsForm):
matrix_inviter_items = MultipleChoiceField(
widget=CheckboxSelectMultiple(attrs={"class": "scrolling-multiple-choice"}),
label=gettext_lazy("Ask Matrix ID for"),
diff --git a/pretix_matrix_inviter/signals.py b/pretix_matrix_inviter/signals.py
index 9cc033a..b441167 100644
--- a/pretix_matrix_inviter/signals.py
+++ b/pretix_matrix_inviter/signals.py
@@ -130,7 +130,7 @@ def matrix_inviter_kick_async(sender, order, **kwargs):
@receiver(nav_event_settings, dispatch_uid="matrix_inviter_nav_settings")
-def navbar_settings(sender, request=None, **kwargs):
+def navbar_settings(sender, request, **kwargs):
url = resolve(request.path_info)
return [
{
diff --git a/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html b/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
index 27c5241..c2e4111 100644
--- a/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
+++ b/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
@@ -7,7 +7,7 @@
<form action="" method="post" class="form-horizontal">
{% csrf_token %}
<fieldset>
- <legend>{% trans "Matrix inviter settings" %}</legend>
+ <legend>{% trans "Settings" %}</legend>
{% bootstrap_form form layout="horizontal" %}
</fieldset>
<div class="form-group submit-group">
diff --git a/pretix_matrix_inviter/urls.py b/pretix_matrix_inviter/urls.py
index c87e9a0..f8d7e8e 100644
--- a/pretix_matrix_inviter/urls.py
+++ b/pretix_matrix_inviter/urls.py
@@ -1,11 +1,11 @@
from django.urls import path
-from .views import MatrixInviterView
+from .views import MatrixInviterSettingsView
urlpatterns = [
path(
"control/event/<str:organizer>/<str:event>/matrix_inviter/",
- MatrixInviterView.as_view(),
+ MatrixInviterSettingsView.as_view(),
name="settings",
)
]
diff --git a/pretix_matrix_inviter/views.py b/pretix_matrix_inviter/views.py
index 92c5a72..da2d490 100644
--- a/pretix_matrix_inviter/views.py
+++ b/pretix_matrix_inviter/views.py
@@ -2,13 +2,13 @@ from django.urls import reverse
from pretix.base.models import Event
from pretix.control.views.event import EventSettingsFormView, EventSettingsViewMixin
-from .forms import MatrixInviterForm
+from .forms import MatrixInviterSettingsForm
-class MatrixInviterView(EventSettingsViewMixin, EventSettingsFormView):
+class MatrixInviterSettingsView(EventSettingsViewMixin, EventSettingsFormView):
model = Event
permission = "can_change_settings"
- form_class = MatrixInviterForm
+ form_class = MatrixInviterSettingsForm
template_name = "pretix_matrix_inviter/settings.html"
def get_success_url(self, **kwargs):
--
GitLab