ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-07-18 07:10:18 +02:00
Code Issues Releases Wiki Activity

Bugs fixed

Browse Source
This commit is contained in:
Ehouarn
2025-07-10 20:05:27 +02:00
parent 89cc03141b
commit 608804db30
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/food/forms.py
View File

@ -145,7 +145,7 @@ class AddIngredientForms(forms.ModelForm):
polymorphic_ctype__model="transformedfood", polymorphic_ctype__model="transformedfood",
is_ready=False, is_ready=False,
end_of_life='', 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: class Meta:
model = TransformedFood model = TransformedFood

3
apps/food/templates/food/food_detail.html
View File

@ -12,6 +12,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
</h3> </h3>
<div class="card-body"> <div class="card-body">
<ul> <ul>
{% if QR_code %}
<li> {{QR_code}} </li>
{% endif %}
{% for field, value in fields %} {% for field, value in fields %}
<li> {{ field }} : {{ value }}</li> <li> {{ field }} : {{ value }}</li>
{% endfor %} {% endfor %}

2
apps/food/views.py
View File

@ -428,6 +428,8 @@ class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
context["fields"] = [( context["fields"] = [(
Food._meta.get_field(field).verbose_name.capitalize(), Food._meta.get_field(field).verbose_name.capitalize(),
value) for field, value in fields.items()] 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["meals"] = self.object.transformed_ingredient_inv.all()
context["update"] = PermissionBackend.check_perm(self.request, "food.change_food") 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")) context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))

4
apps/permission/fixtures/initial.json
View File

@ -3479,11 +3479,11 @@
"food", "food",
"food" "food"
], ],
"query": "{\"end_of_life\": \"\"}", "query": "[\"AND\", {\"end_of_life\": \"\"}, [\"OR\", {\"expiry_date__lte\": [\"today\"]}, {\"is_ready\": true}]]",
"type": "view", "type": "view",
"mask": 1, "mask": 1,
"permanent": false, "permanent": false,
"description": "Voir la bouffe servie" "description": "Voir la bouffe servie ou en open"
} }
}, },
{ {

6
locale/fr/LC_MESSAGES/django.po
View File

@ -529,7 +529,7 @@ msgstr "Nom"
#, fuzzy #, fuzzy
#| msgid "QR-code number" #| msgid "QR-code number"
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 #: apps/food/models.py:23
msgid "Allergen" msgid "Allergen"
@ -623,7 +623,7 @@ msgstr "QR-codes"
#: apps/food/models.py:286 #: apps/food/models.py:286
#: apps/food/templates/food/transformedfood_update.html:24 #: apps/food/templates/food/transformedfood_update.html:24
msgid "QR-code number" msgid "QR-code number"
msgstr "numéro de QR-code" msgstr "Numéro de QR-code"
#: apps/food/templates/food/food_detail.html:19 #: apps/food/templates/food/food_detail.html:19
msgid "Contained in" msgid "Contained in"
@ -4163,7 +4163,7 @@ msgstr ""
#, python-brace-format #, python-brace-format
#~ msgid "QR-code number {qr_code_number}" #~ 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" #~ msgid "was eaten"
#~ msgstr "a été mangé" #~ msgstr "a été mangé"