From e44f6cff7e65e09924a965502da3917b7323dcde Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 22 Nov 2018 13:11:46 +0100 Subject: [PATCH] admin: add source delete view --- passbook/admin/urls.py | 10 ++++------ passbook/admin/views/sources.py | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/passbook/admin/urls.py b/passbook/admin/urls.py index 1a0975b1d..d6a517c73 100644 --- a/passbook/admin/urls.py +++ b/passbook/admin/urls.py @@ -9,11 +9,9 @@ urlpatterns = [ name='applications'), path('applications/create/', applications.ApplicationCreateView.as_view(), name='application-create'), - path('sources/', sources.SourceListView.as_view(), - name='sources'), - path('sources/create/', sources.SourceCreateView.as_view(), - name='source-create'), - path('sources//', sources.SourceUpdateView.as_view(), - name='source-update'), + path('sources/', sources.SourceListView.as_view(), name='sources'), + path('sources/create/', sources.SourceCreateView.as_view(), name='source-create'), + path('sources//update/', sources.SourceUpdateView.as_view(), name='source-update'), + path('sources//delete/', sources.SourceDeleteView.as_view(), name='source-delete'), # path('api/v1/', include('passbook.admin.api.v1.urls')) ] diff --git a/passbook/admin/views/sources.py b/passbook/admin/views/sources.py index 7f334c3b8..b922b70ae 100644 --- a/passbook/admin/views/sources.py +++ b/passbook/admin/views/sources.py @@ -1,8 +1,9 @@ """passbook Source administration""" from django.contrib.messages.views import SuccessMessageMixin +from django.http import Http404 from django.urls import reverse_lazy from django.utils.translation import ugettext as _ -from django.views.generic import CreateView, ListView, UpdateView +from django.views.generic import CreateView, DeleteView, ListView, UpdateView from passbook.admin.mixins import AdminRequiredMixin from passbook.core.models import Source @@ -31,6 +32,8 @@ class SourceCreateView(SuccessMessageMixin, AdminRequiredMixin, CreateView): def get_form_class(self): source_type = self.request.GET.get('type') model = next(x if x.__name__ == source_type else None for x in Source.__subclasses__()) + if not model: + raise Http404 return path_to_class(model.form) @@ -50,3 +53,16 @@ class SourceUpdateView(SuccessMessageMixin, AdminRequiredMixin, UpdateView): def get_object(self, queryset=None): obj = Source.objects.get(pk=self.kwargs.get('pk')) return obj.cast() + + +class SourceDeleteView(SuccessMessageMixin, AdminRequiredMixin, DeleteView): + """Delete source""" + + model = Source + + success_url = reverse_lazy('passbook_admin:sources') + success_message = _('Successfully updated Source') + + def get_object(self, queryset=None): + obj = Source.objects.get(pk=self.kwargs.get('pk')) + return obj.cast()