Bugs fixed again (lost in beta)

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

apps/food/templates/food/food_detail.html

@@ -12,18 +12,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
   </h3>
   <div class="card-body">
     <ul>
+      {% if QR_code %}
+      <li> {{QR_code}} </li>
+      {% endif %}
       {% for field, value in fields %}
       <li> {{ field }} : {{ value }}</li>
       {% endfor %}
       {% if meals %}
-      <li> {% trans "Contained in" %} : 
+      <li> {% trans "Contained in" %} :
       {% for meal in meals %}
-      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %} 
+      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %}
       {% endfor %}
       </li>
       {% endif %}
       {% if foods %}
-      <li> {% trans "Contain" %} : 
+      <li> {% trans "Contain" %} :
       {% for food in foods %}
         <a href="{% url "food:food_view" pk=food.pk %}">{{ food.name }}</a>{% if not forloop.last %},{% endif %}
       {% endfor %}
@@ -31,23 +34,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
       {% endif %}
     </ul>
       {% if update %}
-	<a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
-	  {% trans "Update" %}
-	</a>
+        <a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
+          {% trans "Update" %}
+        </a>
       {% endif %}
       {% if add_ingredient %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
-	  {% trans "Add to a meal" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
+          {% trans "Add to a meal" %}
+        </a>
       {% endif %}
       {% if manage_ingredients %}
         <a class="btn btn-sm btn-secondary" href="{% url "food:manage_ingredients" pk=food.pk %}">
-	  {% trans "Manage ingredients" %}
-	</a>
+          {% trans "Manage ingredients" %}
+        </a>
       {% endif %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
-	  {% trans "Return to the food list" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
+          {% trans "Return to the food list" %}
+        </a>
   </div>
 </div>
-{% endblock %}
+{% endblock %}

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"))

locale/fr/LC_MESSAGES/django.po

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