mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-06-22 18:38:23 +02:00
Compare commits
16 Commits
respo_comm
...
f6649f155a
Author | SHA1 | Date | |
---|---|---|---|
f6649f155a | |||
5707abf9e2 | |||
056c4029f8 | |||
bfd865b3e3 | |||
6ceb43cb66 | |||
9635004520 | |||
05e21ed229 | |||
b2ccc4aede | |||
6229652dea | |||
eee87dcf13 | |||
bcf21507e5 | |||
6127ced143 | |||
f63e5dcb5a | |||
73aa0098bf | |||
694a5c7bd8 | |||
a4480258d7 |
@ -329,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
|
|||||||
context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
|
context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
|
||||||
context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
|
context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
|
||||||
|
|
||||||
activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
|
activities_open = Activity.objects.filter(open=True).filter(
|
||||||
PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
|
PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
|
||||||
context["activities_open"] = [a for a in activities_open
|
context["activities_open"] = [a for a in activities_open
|
||||||
if PermissionBackend.check_perm(self.request,
|
if PermissionBackend.check_perm(self.request,
|
||||||
|
@ -45,7 +45,7 @@ class ProfileForm(forms.ModelForm):
|
|||||||
A form for the extras field provided by the :model:`member.Profile` model.
|
A form for the extras field provided by the :model:`member.Profile` model.
|
||||||
"""
|
"""
|
||||||
# Remove widget=forms.HiddenInput() if you want to use report frequency.
|
# Remove widget=forms.HiddenInput() if you want to use report frequency.
|
||||||
report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
|
report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"), widget=forms.HiddenInput())
|
||||||
|
|
||||||
last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
|
last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
|
||||||
|
|
||||||
|
@ -75,22 +75,17 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
|||||||
|
|
||||||
profile_form = self.profile_form(instance=context['user_object'].profile,
|
profile_form = self.profile_form(instance=context['user_object'].profile,
|
||||||
data=self.request.POST if self.request.POST else None)
|
data=self.request.POST if self.request.POST else None)
|
||||||
|
|
||||||
if not self.object.profile.report_frequency:
|
if not self.object.profile.report_frequency:
|
||||||
del profile_form.fields["last_report"]
|
del profile_form.fields["last_report"]
|
||||||
|
|
||||||
fields_to_check = list(profile_form.fields.keys())
|
fields_to_check = list(profile_form.fields.keys())
|
||||||
fields_modifiable = False
|
|
||||||
|
|
||||||
# Delete the fields for which the user does not have the permission to modify
|
# Delete the fields for which the user does not have the permission to modify
|
||||||
for field_name in fields_to_check:
|
for field_name in fields_to_check:
|
||||||
if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile):
|
if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile):
|
||||||
profile_form.fields[field_name].widget = forms.HiddenInput()
|
profile_form.fields[field_name].widget = forms.HiddenInput()
|
||||||
else:
|
|
||||||
fields_modifiable = True
|
|
||||||
|
|
||||||
if fields_modifiable:
|
context['profile_form'] = profile_form
|
||||||
context['profile_form'] = profile_form
|
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@
|
|||||||
"auth",
|
"auth",
|
||||||
"user"
|
"user"
|
||||||
],
|
],
|
||||||
"query": "[\"AND\", {\"pk\": [\"user\", \"pk\"]}, {\"memberships__club__parent_club__isnull\": true}]",
|
"query": "{\"pk\": [\"user\", \"pk\"]}",
|
||||||
"type": "change",
|
"type": "change",
|
||||||
"mask": 1,
|
"mask": 1,
|
||||||
"field": "last_login",
|
"field": "last_login",
|
||||||
@ -3885,15 +3885,19 @@
|
|||||||
"pk": 247,
|
"pk": 247,
|
||||||
"fields": {
|
"fields": {
|
||||||
"model": [
|
"model": [
|
||||||
"activity",
|
"member",
|
||||||
"guest"
|
"profile"
|
||||||
],
|
],
|
||||||
"query": "{\"activity__organizer\": [\"club\"]}",
|
"query": "{}",
|
||||||
"type": "view",
|
"type": "view",
|
||||||
"mask": 2,
|
"mask": 3,
|
||||||
"field": "",
|
"field": [
|
||||||
|
"ml_events_registration",
|
||||||
|
"ml_art_registration",
|
||||||
|
"ml_sport_registration"
|
||||||
|
],
|
||||||
"permanent": false,
|
"permanent": false,
|
||||||
"description": "Voir les personnes invitées aux événements organisés par son club"
|
"description": "Voir les abonnements aux Newsletters de n'importe quel profil"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -795,11 +795,11 @@ msgstr "Masque de permissions"
|
|||||||
|
|
||||||
#: apps/member/forms.py:46
|
#: apps/member/forms.py:46
|
||||||
msgid "Report frequency"
|
msgid "Report frequency"
|
||||||
msgstr "Fréquence des relevés (en jours)"
|
msgstr "Fréquence des rapports (en jours)"
|
||||||
|
|
||||||
#: apps/member/forms.py:48
|
#: apps/member/forms.py:48
|
||||||
msgid "Last report date"
|
msgid "Last report date"
|
||||||
msgstr "Date de dernier relevé"
|
msgstr "Date de dernier rapport"
|
||||||
|
|
||||||
#: apps/member/forms.py:52
|
#: apps/member/forms.py:52
|
||||||
msgid ""
|
msgid ""
|
||||||
@ -1045,11 +1045,11 @@ msgstr ""
|
|||||||
|
|
||||||
#: apps/member/models.py:117
|
#: apps/member/models.py:117
|
||||||
msgid "report frequency (in days)"
|
msgid "report frequency (in days)"
|
||||||
msgstr "fréquence des relevés (en jours)"
|
msgstr "fréquence des rapports (en jours)"
|
||||||
|
|
||||||
#: apps/member/models.py:122
|
#: apps/member/models.py:122
|
||||||
msgid "last report date"
|
msgid "last report date"
|
||||||
msgstr "date de dernier relevé"
|
msgstr "date de dernier rapport"
|
||||||
|
|
||||||
#: apps/member/models.py:127
|
#: apps/member/models.py:127
|
||||||
msgid "email confirmed"
|
msgid "email confirmed"
|
||||||
|
Reference in New Issue
Block a user