diff --git a/aleksis/apps/alsijil/urls.py b/aleksis/apps/alsijil/urls.py index 76e12ea7b0987cffc1830e7f5f997641e07fc57c..e2bba60a0df002ccf4b110ea8ac5f1e22df8387a 100644 --- a/aleksis/apps/alsijil/urls.py +++ b/aleksis/apps/alsijil/urls.py @@ -30,8 +30,8 @@ urlpatterns = [ path("persons/<int:id_>/", views.overview_person, name="overview_person"), path("me/", views.overview_person, name="overview_me"), path( - "notes/<int:id_>/delete/", - views.delete_personal_note, + "notes/<int:pk>/delete/", + views.DeletePersonalNoteView.as_view(), name="delete_personal_note", ), path("absence/new", views.register_absence, name="register_absence"), diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index c467ee72bfe23d93962fc3739b2b1b24f1bb25d3..f936e19aac0a8bbefb1221ad5a2261b1f63926df 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -7,6 +7,7 @@ from django.http import Http404, HttpRequest, HttpResponse, HttpResponseNotFound from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse, reverse_lazy from django.utils.translation import ugettext as _ +from django.views.generic import DetailView from calendarweek import CalendarWeek from django_tables2 import SingleTableView @@ -638,18 +639,15 @@ def register_absence(request: HttpRequest) -> HttpResponse: return render(request, "alsijil/absences/register.html", context) -def delete_personal_note(request: HttpRequest, id_: int) -> HttpResponse: - context = {} - - personal_note = get_object_or_404(PersonalNote, pk=id_) - - context["object"] = personal_note +class DeletePersonalNoteView(DetailView): + model = PersonalNote + template_name = "core/pages/delete.html" - if request.method == "POST": - personal_note.reset() - return redirect("overview_person", personal_note.person.pk) - else: - return render(request, "core/pages/delete.html", context) + def post(self, request, *args, **kwargs): + note = self.get_object() + note.reset() + messages.success(request, _("The personal note has been deleted.")) + return redirect("overview_person", note.person.pk) class ExtraMarkListView(SingleTableView, PermissionRequiredMixin):