Add another permission for model guest in activity

fix issue with activity entry view

See merge request bde/nk20!282

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).filter(
+        activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=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

@@ -45,7 +45,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"))
 

apps/member/views.py

@@ -75,17 +75,22 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
         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())
+        fields_modifiable = False
 
         # 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()
+            else:
+                fields_modifiable = True
 
-        context['profile_form'] = profile_form
+        if fields_modifiable:
+            context['profile_form'] = profile_form
 
         return context
 

apps/permission/fixtures/initial.json

@@ -127,7 +127,7 @@
                 "auth",
                 "user"
             ],
-            "query": "{\"pk\": [\"user\", \"pk\"]}",
+            "query": "[\"AND\", {\"pk\": [\"user\", \"pk\"]}, {\"memberships__club__parent_club__isnull\": true}]",
             "type": "change",
             "mask": 1,
             "field": "last_login",
@@ -3885,19 +3885,15 @@
         "pk": 247,
         "fields": {
             "model": [
-                "member",
+                "activity",
-                "profile"
+                "guest"
             ],
-            "query": "{}",
+            "query": "{\"activity__organizer\": [\"club\"]}",
             "type": "view",
-            "mask": 3,
+            "mask": 2,
-            "field": [
+            "field": "",
-                "ml_events_registration",
-                "ml_art_registration",
-                "ml_sport_registration"
-            ],
             "permanent": false,
-            "description": "Voir les abonnements aux Newsletters de n'importe quel profil"
+            "description": "Voir les personnes invitées aux événements organisés par son club"
         }
     },
     {

locale/fr/LC_MESSAGES/django.po

@@ -795,11 +795,11 @@ msgstr "Masque de permissions"
 
 #: apps/member/forms.py:46
 msgid "Report frequency"
-msgstr "Fréquence des rapports (en jours)"
+msgstr "Fréquence des relevés (en jours)"
 
 #: apps/member/forms.py:48
 msgid "Last report date"
-msgstr "Date de dernier rapport"
+msgstr "Date de dernier relevé"
 
 #: apps/member/forms.py:52
 msgid ""
@@ -1045,11 +1045,11 @@ msgstr ""
 
 #: apps/member/models.py:117
 msgid "report frequency (in days)"
-msgstr "fréquence des rapports (en jours)"
+msgstr "fréquence des relevés (en jours)"
 
 #: apps/member/models.py:122
 msgid "last report date"
-msgstr "date de dernier rapport"
+msgstr "date de dernier relevé"
 
 #: apps/member/models.py:127
 msgid "email confirmed"