diff --git a/beesgospel/forms.py b/beesgospel/forms.py index 6437123..d09bfb6 100644 --- a/beesgospel/forms.py +++ b/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 = [ diff --git a/beesgospel/views.py b/beesgospel/views.py index 8d17755..2ddf694 100644 --- a/beesgospel/views.py +++ b/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 - permission_required = "beesgospel.add_user" + form_class = MembreEditForm + 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 - permission_required = "beesgospel.change_user" + form_class = MembreEditForm + 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) diff --git a/templates/membres/liste.html b/templates/membres/liste.html index 643374d..1f33b8e 100644 --- a/templates/membres/liste.html +++ b/templates/membres/liste.html @@ -12,14 +12,14 @@