apps/member/templates/member/user_list.html

@@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n perms %}
 
 {% block content %}
-{% if can_manage_registrations %}
+{% if "member.change_profile_registration_valid"|has_perm:user %}
 <a class="btn btn-block btn-secondary mb-3" href="{% url 'registration:future_user_list' %}">
     <i class="fa fa-user-plus"></i> {% trans "Registrations" %}
 </a>

apps/member/views.py

@@ -234,13 +234,6 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
 
         return qs
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        pre_registered_users = User.objects.filter(PermissionBackend.filter_queryset(self.request.user, User, "view"))\
-            .filter(profile__registration_valid=False)
-        context["can_manage_registrations"] = pre_registered_users.exists()
-        return context
-
 
 class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
@@ -254,8 +247,8 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         note = context['object'].note
-        context["aliases"] = AliasTable(
-            note.alias_set.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view")).distinct().all())
+        context["aliases"] = AliasTable(note.alias_set.filter(PermissionBackend
+                                                              .filter_queryset(self.request.user, Alias, "view")).all())
         context["can_create"] = PermissionBackend.check_perm(self.request.user, "note.add_alias", Alias(
             note=context["object"].note,
             name="",
@@ -457,8 +450,8 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         note = context['object'].note
-        context["aliases"] = AliasTable(note.alias_set.filter(
-            PermissionBackend.filter_queryset(self.request.user, Alias, "view")).distinct().all())
+        context["aliases"] = AliasTable(note.alias_set.filter(PermissionBackend
+                                                              .filter_queryset(self.request.user, Alias, "view")).all())
         context["can_create"] = PermissionBackend.check_perm(self.request.user, "note.add_alias", Alias(
             note=context["object"].note,
             name="",
@@ -677,13 +670,11 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
             if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
                 if not last_name:
                     form.add_error('last_name', _("This field is required."))
-                    error = True
                 if not first_name:
                     form.add_error('first_name', _("This field is required."))
-                    error = True
                 if not bank and credit_type.special_type == "Chèque":
                     form.add_error('bank', _("This field is required."))
-                    error = True
+                return self.form_invalid(form)
 
         return not error
 

apps/permission/fixtures/initial.json

@@ -2807,38 +2807,6 @@
 			"description": "Voir ses propres alias, pour toujours"
 		}
 	},
-	{
-		"model": "permission.permission",
-		"pk": 180,
-		"fields": {
-			"model": [
-				"auth",
-				"user"
-			],
-			"query": "{\"profile__registration_valid\": false}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir n'importe quel utilisateur non encore inscrit"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 181,
-		"fields": {
-			"model": [
-				"member",
-				"profile"
-			],
-			"query": "{\"registration_valid\": false}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir n'importe quel profil non encore inscrit"
-		}
-	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -3454,27 +3422,15 @@
 			"name": "PC Kfet",
 			"permissions": [
 				6,
-				22,
 				24,
 				25,
 				26,
 				27,
 				30,
-				49,
-				50,
-				55,
-				56,
-				57,
-				58,
-				143,
 				150,
 				166,
 				167,
-				168,
-				176,
-				177,
-				180,
-				181
+				168
 			]
 		}
 	},

apps/treasury/apps.py

@@ -28,8 +28,6 @@ class TreasuryConfig(AppConfig):
                     source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
                     specialtransactionproxy=None,
             ):
-                proxy = SpecialTransactionProxy(transaction=transaction, remittance=None)
-                proxy._force_save = True
-                proxy.save()
+                SpecialTransactionProxy.objects.create(transaction=transaction, remittance=None)
 
         post_migrate.connect(setup_specialtransactions_proxies, sender=SpecialTransactionProxy)

apps/treasury/signals.py

@@ -10,8 +10,9 @@ def save_special_transaction(instance, created, **kwargs):
     """
 
     if not hasattr(instance, "_no_signal"):
-        if created and RemittanceType.objects.filter(
-                note=instance.source if instance.is_credit() else instance.destination).exists():
-            proxy = SpecialTransactionProxy(transaction=instance, remittance=None)
-            proxy._force_save = True
-            proxy.save()
+        if instance.is_credit():
+            if created and RemittanceType.objects.filter(note=instance.source).exists():
+                SpecialTransactionProxy.objects.create(transaction=instance, remittance=None).save()
+        else:
+            if created and RemittanceType.objects.filter(note=instance.destination).exists():
+                SpecialTransactionProxy.objects.create(transaction=instance, remittance=None).save()