From 72e0aa24a5c75716ae7b638cc50e029016e40a2f Mon Sep 17 00:00:00 2001 From: imperosol Date: Tue, 10 Feb 2026 16:00:15 +0100 Subject: [PATCH] make formula deletion page clearer --- core/templates/core/delete_confirm.jinja | 2 ++ counter/views/admin.py | 15 ++++++++++++++- locale/fr/LC_MESSAGES/django.po | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/core/templates/core/delete_confirm.jinja b/core/templates/core/delete_confirm.jinja index 6ae8a1b2..70fcd764 100644 --- a/core/templates/core/delete_confirm.jinja +++ b/core/templates/core/delete_confirm.jinja @@ -21,6 +21,8 @@

{% trans %}Delete confirmation{% endtrans %}

{% csrf_token %}

{% trans name=object_name %}Are you sure you want to delete "{{ name }}"?{% endtrans %}

+ {% if help_text %}

{{ help_text }}

{% endif %} +
diff --git a/counter/views/admin.py b/counter/views/admin.py index ad48c435..bd87150b 100644 --- a/counter/views/admin.py +++ b/counter/views/admin.py @@ -166,7 +166,9 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView): class ProductFormulaListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView): model = ProductFormula - queryset = ProductFormula.objects.select_related("result") + queryset = ProductFormula.objects.select_related("result").prefetch_related( + "products" + ) template_name = "counter/formula_list.jinja" current_tab = "formulas" permission_required = "counter.view_productformula" @@ -206,6 +208,17 @@ class ProductFormulaDeleteView( success_url = reverse_lazy("counter:product_formula_list") permission_required = "counter.delete_productformula" + def get_context_data(self, **kwargs): + obj_name = self.object.result.name + return super().get_context_data(**kwargs) | { + "object_name": _("%(formula)s (formula)") % {"formula": obj_name}, + "help_text": _( + "This action will only delete the formula, " + "but not the %(product)s product itself." + ) + % {"product": obj_name}, + } + class ReturnableProductListView( CounterAdminTabsMixin, PermissionRequiredMixin, ListView diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 97476bdd..e9f473fe 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3843,6 +3843,20 @@ msgstr "Temps" msgid "Top 100 barman %(counter_name)s (all semesters)" msgstr "Top 100 barman %(counter_name)s (tous les semestres)" +#: counter/views/admin.py +#, python-format +msgid "%(formula)s (formula)" +msgstr "%(formula)s (formule)" + +#: counter/views/admin.py +#, python-format +msgid "" +"This action will only delete the formula, but not the %(product)s product " +"itself." +msgstr "" +"Cette action supprimera seulement la formule, mais pas le produit " +"%(product)s en lui-même." + #: counter/views/admin.py #, python-format msgid "returnable product : %(returnable)s -> %(returned)s"