1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-23 19:06:37 +02:00

Compare commits

..

23 Commits

Author SHA1 Message Date
9e7f7df721 Some improvements 2025-02-13 20:09:45 +01:00
62baad7b69 Cancel modifications 2025-02-13 19:40:04 +01:00
6e49140900 Fix some errors 2025-02-13 19:09:27 +01:00
e5567c6c8a Fix some errors 2025-02-13 18:59:22 +01:00
238ba78f4f Forgot to import PermissionBackend 2025-02-13 00:54:55 +01:00
0ec771b5ee Add some security 2025-02-13 00:39:05 +01:00
c841fb6068 Some corrections for report_frequency 2025-02-12 23:46:19 +01:00
f6649f155a linters 2025-02-09 16:51:31 +01:00
5707abf9e2 Update file views.py 2025-02-09 16:22:03 +01:00
056c4029f8 Update file views.py 2025-02-09 16:19:26 +01:00
bfd865b3e3 Update file views.py 2025-02-09 16:14:28 +01:00
6ceb43cb66 Update file views.py 2025-02-09 16:07:30 +01:00
9635004520 Update file views.py 2025-02-09 15:56:12 +01:00
05e21ed229 Update file views.py 2025-02-09 15:51:05 +01:00
b2ccc4aede Update file views.py 2025-02-09 15:50:13 +01:00
6229652dea Update file views.py 2025-02-09 15:47:32 +01:00
eee87dcf13 Update file views.py 2025-02-09 15:42:20 +01:00
bcf21507e5 Update file views.py 2025-02-09 15:39:08 +01:00
6127ced143 Update file views.py 2025-02-09 15:33:37 +01:00
f63e5dcb5a Update file views.py 2025-02-09 15:26:39 +01:00
73aa0098bf Update file views.py 2025-02-09 15:20:03 +01:00
694a5c7bd8 Update file initial.json 2025-02-09 13:05:10 +01:00
a4480258d7 Update file initial.json 2025-02-09 12:45:46 +01:00
6 changed files with 26 additions and 23 deletions

View File

@ -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,

View File

@ -44,10 +44,10 @@ 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.
report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date")) report_frequency = forms.IntegerField(required=False, initial=0, label=_("Statement frequency (in days)"))
last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last statement date"))
VSS_charter_read = forms.BooleanField( VSS_charter_read = forms.BooleanField(
required=True, required=True,

View File

@ -114,12 +114,12 @@ class Profile(models.Model):
) )
report_frequency = models.PositiveSmallIntegerField( report_frequency = models.PositiveSmallIntegerField(
verbose_name=_("report frequency (in days)"), verbose_name=_("Statement frequency (in days)"),
default=0, default=0,
) )
last_report = models.DateTimeField( last_report = models.DateTimeField(
verbose_name=_("last report date"), verbose_name=_("Last statement date"),
default=timezone.now, default=timezone.now,
) )

View File

@ -75,7 +75,6 @@ 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"]
@ -86,10 +85,10 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
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: else :
fields_modifiable = True fields_modifiable = True
if fields_modifiable: if fields_modifiable :
context['profile_form'] = profile_form context['profile_form'] = profile_form
return context return context

View File

@ -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"
} }
}, },
{ {

View File

@ -794,11 +794,11 @@ msgid "Permission mask"
msgstr "Masque de permissions" msgstr "Masque de permissions"
#: apps/member/forms.py:46 #: apps/member/forms.py:46
msgid "Report frequency" msgid "Statement frequency (in days)"
msgstr "Fréquence des relevés (en jours)" msgstr "Fréquence des relevés (en jours)"
#: apps/member/forms.py:48 #: apps/member/forms.py:48
msgid "Last report date" msgid "Last statement date"
msgstr "Date de dernier relevé" msgstr "Date de dernier relevé"
#: apps/member/forms.py:52 #: apps/member/forms.py:52
@ -1044,12 +1044,12 @@ msgstr ""
"artistiques sur le campus (1 mail par semaine)" "artistiques sur le campus (1 mail par semaine)"
#: apps/member/models.py:117 #: apps/member/models.py:117
msgid "report frequency (in days)" msgid "Statement frequency (in days)"
msgstr "fréquence des relevés (en jours)" msgstr "Fréquence des relevés (en jours)"
#: apps/member/models.py:122 #: apps/member/models.py:122
msgid "last report date" msgid "Last statement date"
msgstr "date de dernier relevé" msgstr "Date de dernier relevé"
#: apps/member/models.py:127 #: apps/member/models.py:127
msgid "email confirmed" msgid "email confirmed"