Forgot to import PermissionBackend

Automation mailing lists

See merge request bde/nk20!280

apps/member/forms.py

@@ -15,6 +15,7 @@ from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import Autocomplete, AmountInput
 from permission.models import PermissionMask, Role
+from permission.backends import PermissionBackend
 from PIL import Image, ImageSequence
 
 from .models import Profile, Club, Membership
@@ -44,9 +45,10 @@ class ProfileForm(forms.ModelForm):
     """
     A form for the extras field provided by the :model:`member.Profile` model.
     """
-    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(
         required=True,
@@ -65,6 +67,14 @@ class ProfileForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
         self.fields['address'].widget.attrs.update({"placeholder": "4 avenue des Sciences, 91190 GIF-SUR-YVETTE"})
         self.fields['promotion'].widget.attrs.update({"max": timezone.now().year})
+    
+    def clean(self):
+        """Force the values of fields that the user does not have permission to modify.."""
+        cleaned_data = super().clean()
+        for field_name in self.fields.keys():
+            if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", self.instance):
+                cleaned_data[field_name] = getattr(self.instance, field_name)  # Force the old value
+        return cleaned_data
 
     @transaction.atomic
     def save(self, commit=True):
@@ -76,7 +86,8 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = Profile
         fields = '__all__'
-        exclude = ('user', 'email_confirmed', 'registration_valid', )
+        # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list.
+        exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', )
 
 
 class ImageForm(forms.Form):

apps/member/models.py

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

apps/member/views.py

@@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from django import forms
 
 from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
     CustomAuthenticationForm, MembershipRolesForm
@@ -72,11 +73,19 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         form.fields['email'].required = True
         form.fields['email'].help_text = _("This address must be valid.")
 
-        if PermissionBackend.check_perm(self.request, "member.change_profile", context['user_object'].profile):
-            context['profile_form'] = self.profile_form(instance=context['user_object'].profile,
-                                                        data=self.request.POST if self.request.POST else None)
-            if not self.object.profile.report_frequency:
-                del context['profile_form'].fields["last_report"]
+        profile_form = self.profile_form(instance=context['user_object'].profile,
+                                         data=self.request.POST if self.request.POST else None)
+        if not self.object.profile.report_frequency:
+            del profile_form.fields["last_report"]
+
+        fields_to_check = list(profile_form.fields.keys())
+
+        # Delete the fields for which the user does not have the permission to modify
+        for field_name in fields_to_check:
+            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()
+
+        context['profile_form'] = profile_form
 
         return context
 

apps/permission/admin.py

@@ -31,3 +31,4 @@ class RoleAdmin(admin.ModelAdmin):
     Admin customisation for Role
     """
     list_display = ('name', )
+    filter_horizontal = ('permissions',)

apps/permission/fixtures/initial.json

@@ -3800,6 +3800,106 @@
             "description": "Voir les utilisateurs adhérents au club parent"
         }
     },
+    {
+        "model": "permission.permission",
+        "pk": 242,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction vers la note d'un club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 243,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{\"user__memberships__club\": [\"club\"], \"user__memberships__date_start__lte\": [\"today\"],\"user__memberships__date_end__gte\": [\"today\"]}",
+            "type": "view",
+            "mask": 3,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les profils des membres du club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 244,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{}",
+            "type": "change",
+            "mask": 3,
+            "field": "ml_events_registration",
+            "permanent": false,
+            "description": "Modifier l'abonnement à la Newsletter BDE pour n'importe quel profil"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 245,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{}",
+            "type": "change",
+            "mask": 3,
+            "field": "ml_art_registration",
+            "permanent": false,
+            "description": "Modifier l'abonnement à la Newsletter Art pour n'importe quel profil"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 246,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{}",
+            "type": "change",
+            "mask": 3,
+            "field": "ml_sport_registration",
+            "permanent": false,
+            "description": "Modifier l'abonnement à la Newsletter Sport pour n'importe quel profil"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 247,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{}",
+            "type": "view",
+            "mask": 3,
+            "field": [
+                "ml_events_registration",
+                "ml_art_registration",
+                "ml_sport_registration"
+            ],
+            "permanent": false,
+            "description": "Voir les abonnements aux Newsletters de n'importe quel profil"
+        }
+    },
     {
         "model": "permission.role",
         "pk": 1,
@@ -4377,7 +4477,7 @@
                 238
             ]
         }
-    },
+    },  
     {
         "model": "wei.weirole",
         "pk": 12,

locale/fr/LC_MESSAGES/django.po

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

note.cron

@@ -26,3 +26,5 @@ MAILTO=notekfet2020@lists.crans.org
  00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons -v 0
 # Vider les tokens Oauth2
  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
+# Envoyer la liste des abonnés à la NL BDA
+ 00  8     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -v 0