Merge branch 'New_permission' into 'main'

Draft: New permission

See merge request bde/nk20!278

apps/activity/views.py

@@ -329,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).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()
         context["activities_open"] = [a for a in activities_open
                                       if PermissionBackend.check_perm(self.request,

apps/member/forms.py

@@ -44,8 +44,7 @@ class ProfileForm(forms.ModelForm):
     """
     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"), widget=forms.HiddenInput())
+    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 
@@ -77,8 +76,7 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = Profile
         fields = '__all__'
-        # 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', )
+        exclude = ('user', 'email_confirmed', 'registration_valid', )
 
 
 class ImageForm(forms.Form):

apps/permission/admin.py

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

apps/permission/fixtures/initial.json

@@ -4409,7 +4409,64 @@
                 238
             ]
         }
-    },  
+    },
+    {
+        "model": "permission.role",
+        "pk": 23,
+            "fields": {
+            "for_club": 10,
+            "name": "Tr\u00e9sorièr\u22c5e BDA",
+            "permissions": [
+                33,
+                55,
+                56,
+                57,
+                58,
+                135,
+                143,
+                176,
+                177,
+                178
+            ]
+        }
+    },
+    {
+        "model": "permission.role",
+        "pk": 24,
+            "fields": {
+            "for_club": 10,
+            "name": "Respo sortie",
+            "permissions": [
+                239,
+                240,
+                241,
+                242,
+                243
+            ]
+        }
+    },
+    {
+        "model": "permission.role",
+        "pk": 25,
+            "fields": {
+            "for_club": 267,
+            "name": "Tr\u00e9sorièr\u22c5e Terre à terre",
+            "permissions": [
+                33,
+                55,
+                56,
+                57,
+                58,
+                135,
+                143,
+                176,
+                177,
+                178
+            ]
+        }
+    },
+
+    
     {
         "model": "wei.weirole",
         "pk": 12,

note.cron

@@ -26,5 +26,3 @@ 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