From 361de9f8b4b2be2d828c788dff2c50befab04b88 Mon Sep 17 00:00:00 2001 From: nicomarg Date: Thu, 29 Aug 2024 21:06:34 +0200 Subject: [PATCH] more bug fixing --- apps/permission/fixtures/initial.json | 7 ++++--- apps/registration/views.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 5b8dbed9..918362e3 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -3751,7 +3751,8 @@ "permanent": false, "description": "Modifier bouffe" } - }, { + }, + { "model": "permission.permission", "pk": 239, "fields": { @@ -3759,12 +3760,12 @@ "note", "alias" ], - "query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club\": \"club\", \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]", + "query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club\": [\"club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]", "type": "view", "mask": 1, "field": "", "permanent": false, - "description": "Voir les alias des notes des clubs et des adhérent⋅es du club BDE" + "description": "Voir les alias des notes des clubs et des adhérent⋅es du club" } }, { diff --git a/apps/registration/views.py b/apps/registration/views.py index 99159a78..2a2e0a16 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -306,7 +306,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, return super().form_invalid(form) if join_kfet and not join_bde: - forl.add_error('join_bde', _("You must also join the parent club BDE.")) + form.add_error('join_bde', _("You must also join the parent club BDE.")) + return super().form_invalid(form) # Calculate required registration fee fee = 0