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..2d805d6b 100644
--- a/apps/food/templates/food/food_detail.html
+++ b/apps/food/templates/food/food_detail.html
@@ -12,6 +12,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ {% if QR_code %}
+ - {{QR_code}}
+ {% endif %}
{% for field, value in fields %}
- {{ field }} : {{ value }}
{% endfor %}
diff --git a/apps/food/views.py b/apps/food/views.py
index f8c7977d..b6aa2caa 100644
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -428,6 +428,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"))
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index f1f01dcc..a33a3fcf 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -3479,11 +3479,11 @@
"food",
"food"
],
- "query": "{\"end_of_life\": \"\"}",
+ "query": "[\"AND\", {\"end_of_life\": \"\"}, [\"OR\", {\"expiry_date__lte\": [\"today\"]}, {\"is_ready\": true}]]",
"type": "view",
"mask": 1,
"permanent": false,
- "description": "Voir la bouffe servie"
+ "description": "Voir la bouffe servie ou en open"
}
},
{
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 23ba06dd..3e5001c5 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -529,7 +529,7 @@ msgstr "Nom"
#, fuzzy
#| msgid "QR-code number"
msgid "QR code number"
-msgstr "numéro de QR-code"
+msgstr "Numéro de QR-code"
#: apps/food/models.py:23
msgid "Allergen"
@@ -623,7 +623,7 @@ msgstr "QR-codes"
#: apps/food/models.py:286
#: apps/food/templates/food/transformedfood_update.html:24
msgid "QR-code number"
-msgstr "numéro de QR-code"
+msgstr "Numéro de QR-code"
#: apps/food/templates/food/food_detail.html:19
msgid "Contained in"
@@ -4163,7 +4163,7 @@ msgstr ""
#, python-brace-format
#~ msgid "QR-code number {qr_code_number}"
-#~ msgstr "numéro du QR-code {qr_code_number}"
+#~ msgstr "Numéro du QR-code {qr_code_number}"
#~ msgid "was eaten"
#~ msgstr "a été mangé"