mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-03 21:37:49 -05:00
fixed ingredient deletion error
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user