mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 21:37:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed ingredient deletion error

Browse Source
This commit is contained in:
vabene1111
2020-06-10 11:52:24 +02:00
parent 12036b9972
commit 9575a86480
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cookbook/templates/generic/edit_template.html
View File

@@ -21,13 +21,17 @@
{% csrf_token %} {% csrf_token %}
{{ form|crispy }} {{ form|crispy }}
<button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button> <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 %}" {% delete_url form.instance|get_class form.instance.pk as delete_view_url %}
class="btn btn-danger"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a> {% 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 %} {% if view_url %}
<a href="{{ view_url }}" class="btn btn-info"><i class="far fa-eye"></i> {% trans 'View' %}</a> <a href="{{ view_url }}" class="btn btn-info"><i class="far fa-eye"></i> {% trans 'View' %}</a>
{% endif %} {% endif %}
{% if delete_external_url %} {% 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 %} {% endif %}
</form> </form>

7
cookbook/templatetags/custom_tags.py
View File

@@ -3,7 +3,7 @@ import markdown as md
from bleach_whitelist import markdown_tags, markdown_attrs from bleach_whitelist import markdown_tags, markdown_attrs
from django import template from django import template
from django.db.models import Avg 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_attributes import MarkdownFormatExtension
from cookbook.helper.mdx_urlize import UrlizeExtension from cookbook.helper.mdx_urlize import UrlizeExtension
@@ -24,7 +24,10 @@ def get_class(value):
@register.simple_tag @register.simple_tag
def delete_url(model, pk): 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() @register.filter()

12
cookbook/views/delete.py
View File

@@ -79,18 +79,6 @@ class KeywordDelete(GroupRequiredMixin, DeleteView):
return context 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): class StorageDelete(GroupRequiredMixin, DeleteView):
groups_required = ['admin'] groups_required = ['admin']
template_name = "generic/delete_template.html" template_name = "generic/delete_template.html"