ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

more bug fixing

This commit is contained in:
nicomarg 2024-08-29 21:06:34 +02:00
parent e2426bd6a6
commit 361de9f8b4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/permission/fixtures/initial.json
View File

@ -3751,7 +3751,8 @@
"permanent": false, "permanent": false,
"description": "Modifier bouffe" "description": "Modifier bouffe"
} }
}, { },
{
"model": "permission.permission", "model": "permission.permission",
"pk": 239, "pk": 239,
"fields": { "fields": {
@ -3759,12 +3760,12 @@
"note", "note",
"alias" "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", "type": "view",
"mask": 1, "mask": 1,
"field": "", "field": "",
"permanent": false, "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"
} }
}, },
{ {

3
apps/registration/views.py
View File

@ -306,7 +306,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
return super().form_invalid(form) return super().form_invalid(form)
if join_kfet and not join_bde: 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 # Calculate required registration fee
fee = 0 fee = 0