Add username field to checkpoint form

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(

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)