From 755997a9c7892555e69db9f8a2a62c4955f5da2e Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@haufe-lexware.com>
Date: Mon, 26 Nov 2018 22:30:14 +0100
Subject: [PATCH] admin: add generic create and delete template

---
 .../templates/generic/create_inheritance.html | 11 ++++++++++
 passbook/admin/templates/generic/delete.html  | 20 +++++++++++++++++++
 passbook/admin/templates/generic/form.html    |  3 ++-
 passbook/admin/views/rules.py                 | 10 ++++------
 passbook/admin/views/sources.py               |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 passbook/admin/templates/generic/create_inheritance.html
 create mode 100644 passbook/admin/templates/generic/delete.html

diff --git a/passbook/admin/templates/generic/create_inheritance.html b/passbook/admin/templates/generic/create_inheritance.html
new file mode 100644
index 000000000..eff352942
--- /dev/null
+++ b/passbook/admin/templates/generic/create_inheritance.html
@@ -0,0 +1,11 @@
+{% extends "generic/create.html" %}
+
+{% load i18n %}
+
+{% block title %}
+{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}
+{% endblock %}
+
+{% block above_form %}
+<h1>{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}</h1>
+{% endblock %}
\ No newline at end of file
diff --git a/passbook/admin/templates/generic/delete.html b/passbook/admin/templates/generic/delete.html
new file mode 100644
index 000000000..948ac9817
--- /dev/null
+++ b/passbook/admin/templates/generic/delete.html
@@ -0,0 +1,20 @@
+{% extends "administration/base.html" %}
+
+{% load i18n %}
+{% load utils %}
+
+{% block content %}
+<div class="container">
+  {% block above_form %}
+    <h1>{% trans 'Delete' %}</h1>
+  {% endblock %}
+  <div class="">
+    <form method="post" class="form-horizontal">
+      {% csrf_token %}
+      <p>Are you sure you want to delete "{{ object }}"?</p>
+      <a href="{% back %}" class="btn btn-default">{% trans 'Back' %}</a>
+      <input type="submit" class="btn btn-danger" value="{% trans 'Delete' %}" />
+    </form>
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/passbook/admin/templates/generic/form.html b/passbook/admin/templates/generic/form.html
index 541ab2466..9372c2452 100644
--- a/passbook/admin/templates/generic/form.html
+++ b/passbook/admin/templates/generic/form.html
@@ -1,7 +1,7 @@
 {% extends "administration/base.html" %}
 
-{% load crispy_forms_tags %}
 {% load i18n %}
+{% load utils %}
 
 {% block content %}
 <div class="container">
@@ -10,6 +10,7 @@
   <div class="">
     <form action="" method="post" class="form-horizontal">
       {% include 'blocks/form.html' with form=form %}
+      <a class="btn btn-default" href="{% back %}">{% trans "Cancel" %}</a>
       <input type="submit" class="btn btn-primary" value="{% trans 'Create' %}" />
     </form>
   </div>
diff --git a/passbook/admin/views/rules.py b/passbook/admin/views/rules.py
index e8e0c169a..aa4917389 100644
--- a/passbook/admin/views/rules.py
+++ b/passbook/admin/views/rules.py
@@ -28,7 +28,7 @@ class RuleListView(AdminRequiredMixin, ListView):
 class RuleCreateView(SuccessMessageMixin, AdminRequiredMixin, CreateView):
     """Create new Rule"""
 
-    template_name = 'administration/rule/create.html'
+    template_name = 'generic/create_inheritance.html'
     success_url = reverse_lazy('passbook_admin:rules')
     success_message = _('Successfully created Rule')
 
@@ -55,18 +55,16 @@ class RuleUpdateView(SuccessMessageMixin, AdminRequiredMixin, UpdateView):
         return form_class
 
     def get_object(self, queryset=None):
-        obj = Rule.objects.get(pk=self.kwargs.get('pk'))
-        return obj.cast()
+        return Rule.objects.filter(pk=self.kwargs.get('pk')).select_subclasses().first()
 
 
 class RuleDeleteView(SuccessMessageMixin, AdminRequiredMixin, DeleteView):
     """Delete rule"""
 
     model = Rule
-
+    template_name = 'generic/delete.html'
     success_url = reverse_lazy('passbook_admin:rules')
     success_message = _('Successfully updated Rule')
 
     def get_object(self, queryset=None):
-        obj = Rule.objects.get(pk=self.kwargs.get('pk'))
-        return obj.cast()
+        return Rule.objects.filter(pk=self.kwargs.get('pk')).select_subclasses().first()
diff --git a/passbook/admin/views/sources.py b/passbook/admin/views/sources.py
index f40b3c237..777289ff1 100644
--- a/passbook/admin/views/sources.py
+++ b/passbook/admin/views/sources.py
@@ -28,7 +28,7 @@ class SourceListView(AdminRequiredMixin, ListView):
 class SourceCreateView(SuccessMessageMixin, AdminRequiredMixin, CreateView):
     """Create new Source"""
 
-    template_name = 'administration/source/create.html'
+    template_name = 'generic/create_inheritance.html'
     success_url = reverse_lazy('passbook_admin:sources')
     success_message = _('Successfully created Source')