1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-07-20 16:09:12 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
b97b79e2ea translation 2025-07-12 14:05:53 +02:00
695ce63e08 Merge branch 'food_traceability' into 'beta'
Easier access to food details

See merge request bde/nk20!326
2025-07-11 17:15:50 +02:00
4 changed files with 17 additions and 22 deletions

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(), Food, "change")).exclude(pk=pk) ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
class Meta: class Meta:
model = TransformedFood model = TransformedFood

View File

@ -12,9 +12,6 @@ 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 %}

View File

@ -455,8 +455,6 @@ 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"))

View File

@ -4078,7 +4078,7 @@ msgstr "FAQ (FR)"
#: note_kfet/templates/base.html:222 #: note_kfet/templates/base.html:222
msgid "Managed by BDE" msgid "Managed by BDE"
msgstr "Gérer par le BDE" msgstr "Géré par le BDE"
#: note_kfet/templates/base.html:224 #: note_kfet/templates/base.html:224
msgid "Hosted by Cr@ns" msgid "Hosted by Cr@ns"