diff --git a/apps/food/forms.py b/apps/food/forms.py
index dfa32008..13c5cba3 100644
--- a/apps/food/forms.py
+++ b/apps/food/forms.py
@@ -145,7 +145,7 @@ class AddIngredientForms(forms.ModelForm):
polymorphic_ctype__model="transformedfood",
is_ready=False,
end_of_life='',
- ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
+ ).filter(PermissionBackend.filter_queryset(get_current_request(), Food, "change")).exclude(pk=pk)
class Meta:
model = TransformedFood
diff --git a/apps/food/templates/food/food_detail.html b/apps/food/templates/food/food_detail.html
index 9343f6d1..e82cc907 100644
--- a/apps/food/templates/food/food_detail.html
+++ b/apps/food/templates/food/food_detail.html
@@ -12,18 +12,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ {% if QR_code %}
+ - {{QR_code}}
+ {% endif %}
{% for field, value in fields %}
- {{ field }} : {{ value }}
{% endfor %}
{% if meals %}
- - {% trans "Contained in" %} :
+
- {% trans "Contained in" %} :
{% for meal in meals %}
- {{ meal.name }}{% if not forloop.last %},{% endif %}
+ {{ meal.name }}{% if not forloop.last %},{% endif %}
{% endfor %}
{% endif %}
{% if foods %}
- - {% trans "Contain" %} :
+
- {% trans "Contain" %} :
{% for food in foods %}
{{ food.name }}{% if not forloop.last %},{% endif %}
{% endfor %}
@@ -31,23 +34,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% endif %}
{% if update %}
-
- {% trans "Update" %}
-
+
+ {% trans "Update" %}
+
{% endif %}
{% if add_ingredient %}
-
- {% trans "Add to a meal" %}
-
+
+ {% trans "Add to a meal" %}
+
{% endif %}
{% if manage_ingredients %}
- {% trans "Manage ingredients" %}
-
+ {% trans "Manage ingredients" %}
+
{% endif %}
-
- {% trans "Return to the food list" %}
-
+
+ {% trans "Return to the food list" %}
+
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/apps/food/views.py b/apps/food/views.py
index 393e4072..bebf1939 100644
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -455,6 +455,8 @@ class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
context["fields"] = [(
Food._meta.get_field(field).verbose_name.capitalize(),
value) for field, value in fields.items()]
+ if self.object.QR_code.exists():
+ context["QR_code"] = self.object.QR_code.first()
context["meals"] = self.object.transformed_ingredient_inv.all()
context["update"] = PermissionBackend.check_perm(self.request, "food.change_food")
context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))