From 9575a864805f6cee2864748f248338419f10695d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 10 Jun 2020 11:52:24 +0200
Subject: [PATCH] fixed ingredient deletion error

---
 cookbook/templates/generic/edit_template.html | 10 +++++++---
 cookbook/templatetags/custom_tags.py          |  7 +++++--
 cookbook/views/delete.py                      | 12 ------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cookbook/templates/generic/edit_template.html b/cookbook/templates/generic/edit_template.html
index fde67fb77..244c17139 100644
--- a/cookbook/templates/generic/edit_template.html
+++ b/cookbook/templates/generic/edit_template.html
@@ -21,13 +21,17 @@
         {% csrf_token %}
         {{ form|crispy }}
         <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
-        <a href="{% delete_url form.instance|get_class form.instance.pk %}"
-           class="btn btn-danger"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a>
+        {% delete_url form.instance|get_class form.instance.pk as delete_view_url %}
+        {% if delete_view_url %}
+            <a href="{{ delete_view_url }}"
+               class="btn btn-danger"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a>
+        {% endif %}
         {% if view_url %}
             <a href="{{ view_url }}" class="btn btn-info"><i class="far fa-eye"></i> {% trans 'View' %}</a>
         {% endif %}
         {% if delete_external_url %}
-            <a href="{{ delete_external_url }}" class="btn btn-warning"><i class="fas fa-exclamation-triangle"></i> {% trans 'Delete original file' %}</a>
+            <a href="{{ delete_external_url }}" class="btn btn-warning"><i
+                    class="fas fa-exclamation-triangle"></i> {% trans 'Delete original file' %}</a>
         {% endif %}
     </form>
 
diff --git a/cookbook/templatetags/custom_tags.py b/cookbook/templatetags/custom_tags.py
index d9ce7d25b..877f63641 100644
--- a/cookbook/templatetags/custom_tags.py
+++ b/cookbook/templatetags/custom_tags.py
@@ -3,7 +3,7 @@ import markdown as md
 from bleach_whitelist import markdown_tags, markdown_attrs
 from django import template
 from django.db.models import Avg
-from django.urls import reverse
+from django.urls import reverse, NoReverseMatch
 
 from cookbook.helper.mdx_attributes import MarkdownFormatExtension
 from cookbook.helper.mdx_urlize import UrlizeExtension
@@ -24,7 +24,10 @@ def get_class(value):
 
 @register.simple_tag
 def delete_url(model, pk):
-    return reverse(f'delete_{get_model_name(model)}', args=[pk])
+    try:
+        return reverse(f'delete_{get_model_name(model)}', args=[pk])
+    except NoReverseMatch:
+        return None
 
 
 @register.filter()
diff --git a/cookbook/views/delete.py b/cookbook/views/delete.py
index 67e5429b4..34112dee4 100644
--- a/cookbook/views/delete.py
+++ b/cookbook/views/delete.py
@@ -79,18 +79,6 @@ class KeywordDelete(GroupRequiredMixin, DeleteView):
         return context
 
 
-class IngredientDelete(GroupRequiredMixin, DeleteView):
-    groups_required = ['user']
-    template_name = "generic/delete_template.html"
-    model = Ingredient
-    success_url = reverse_lazy('list_ingredient')
-
-    def get_context_data(self, **kwargs):
-        context = super(IngredientDelete, self).get_context_data(**kwargs)
-        context['title'] = _("Ingredient")
-        return context
-
-
 class StorageDelete(GroupRequiredMixin, DeleteView):
     groups_required = ['admin']
     template_name = "generic/delete_template.html"