Corr permissions ajout/édition membre

beesgospel/forms.py

@@ -36,7 +36,7 @@ class LoginForm(BootstrapMixin, auth_forms.AuthenticationForm):
     )
 
 
-class UserEditForm(BootstrapMixin, forms.ModelForm):
+class MembreEditForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = Membre
         fields = [

beesgospel/views.py

@@ -5,7 +5,7 @@ from django.views.generic import (
     CreateView, DeleteView, ListView, TemplateView, UpdateView
 )
 
-from .forms import UserEditForm
+from .forms import MembreEditForm
 from .models import Agenda, Document, Membre
 
 
@@ -78,19 +78,23 @@ class ListeMembresView(LoginRequiredMixin, ListView):
 
 class MembreAddView(PermissionRequiredMixin, CreateView):
     model = Membre
-    form_class = UserEditForm
+    form_class = MembreEditForm
-    permission_required = "beesgospel.add_user"
+    permission_required = "beesgospel.add_membre"
     template_name = "membres/edit.html"
     success_url = reverse_lazy("liste-membres")
 
 
 class MembreEditView(PermissionRequiredMixin, UpdateView):
     model = Membre
-    form_class = UserEditForm
+    form_class = MembreEditForm
-    permission_required = "beesgospel.change_user"
+    permission_required = "beesgospel.change_membre"
     template_name = "membres/edit.html"
     success_url = reverse_lazy("liste-membres")
 
 
 class MembreDeleteView(PermissionRequiredMixin, DeleteView):
-    permission_required = "beesgospel.delete_user"
+    permission_required = "beesgospel.delete_membre"
+
+    def form_valid(self, form):
+        self.object.user.delete()
+        return super().form_valid(form)

templates/membres/liste.html

@@ -12,14 +12,14 @@
             <td>{{ membre.courriel }}</td>
             <td>{{ membre.date_naissance|date:"d.m.Y" }}</td>
             <td>{{ membre.annee_entree|default_if_none:"" }}</td>
-            <td>{% if perms.beesgospel.change_user %}
+            <td>{% if perms.beesgospel.change_membre %}
                 <a href="{% url 'membre-edit' membre.pk %}"><img src="{% static 'admin/img/icon-changelink.svg' %}"></a>
                 {% endif %}
             </td>
         </tr>
     {% endfor %}
     </table>
-    {% if perms.beesgospel.add_user %}
+    {% if perms.beesgospel.add_membre %}
     <div class="mt-3"><a class="btn btn-outline-primary" href="{% url 'membre-add' %}">Ajouter un membre</a></div>
     {% endif %}
 {% endblock %}