From b44741a361e5faabe99e56948467bb65059d5f26 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Wed, 29 Jun 2022 12:52:02 +0200
Subject: [PATCH] Add username field to checkpoint form
---
aleksis/apps/paweljong/forms.py | 3 +--
aleksis/apps/paweljong/rules.py | 12 ++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py
index 48f1d4a..f5ac82c 100644
--- a/aleksis/apps/paweljong/forms.py
+++ b/aleksis/apps/paweljong/forms.py
@@ -510,7 +510,7 @@ class EventCheckpointForm(forms.Form):
js = ("https://unpkg.com/html5-qrcode", "js/paweljong/qrscanner.js", "js/paweljong/checkpoint.js")
layout = Layout(
- "comment", "use_latlon",
+ "comment", "use_latlon", "username"
)
comment = forms.CharField(
@@ -523,7 +523,6 @@ class EventCheckpointForm(forms.Form):
required=True,
label=_("Person"),
help_text=_("Please enter a username."),
- widget=forms.HiddenInput(),
)
use_latlon = forms.BooleanField(
diff --git a/aleksis/apps/paweljong/rules.py b/aleksis/apps/paweljong/rules.py
index 3e15380..b5b6828 100644
--- a/aleksis/apps/paweljong/rules.py
+++ b/aleksis/apps/paweljong/rules.py
@@ -59,12 +59,6 @@ view_events_predicate = has_person & (
)
rules.add_perm("paweljong.view_events_rule", view_events_predicate)
-# Edit events
-change_events_predicate = has_person & (
- has_global_perm("paweljong.change_event") | has_any_object("paweljong.change_event_rule", Event)
-)
-rules.add_perm("paweljong.change_events_rule", change_events_predicate)
-
# Edit event
change_event_predicate = has_person & (
has_global_perm("paweljong.change_event")
@@ -73,6 +67,12 @@ change_event_predicate = has_person & (
)
rules.add_perm("paweljong.change_event_rule", change_event_predicate)
+# Edit events
+change_events_predicate = has_person & (
+ has_global_perm("paweljong.change_event") | has_any_object("paweljong.change_event_rule", Event)
+)
+rules.add_perm("paweljong.change_events_rule", change_events_predicate)
+
# Checkpoint
checkpoint_predicate = change_event_predicate
rules.add_perm("paweljong.event_checkpoint_rule", checkpoint_predicate)
--
GitLab