Merge pull request #1509 from ae-utbm/taiste

Third-party auth, UE guide style, CGU, and bugfixes

counter/templates/counter/product_form.jinja

@@ -83,17 +83,8 @@
 {% endmacro %}
 
 {% block content %}
-  <div class="alert alert-yellow">
-    <div class="alert-main">
-      {%- trans trimmed -%}
-        You can see product details.
-        However, you cannot edit it, thus you won't be able
-        to submit this form.
-      {%- endtrans -%}
-    </div>
-  </div>
   {% if object %}
-    <h2>{{ object }}</h2>
+    <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
     <p><i>{% trans %}Creation date{% endtrans %} : {{ object.created_at|date }}</i></p>
     <p><i>{% trans %}Last update{% endtrans %} : {{ object.updated_at|date }}</i></p>
   {% else %}
@@ -136,17 +127,19 @@
       {{ form.price_formset.management_form }}
       <div x-ref="formContainer">
         {%- for form in form.price_formset.forms -%}
-          <div>{{ price_form(form) }}</div>
+          <div>
+            {{ price_form(form) }}
+          </div>
         {%- endfor -%}
       </div>
       <template x-ref="formTemplate">
-        <div>{{ price_form(form.price_formset.empty_form) }}</div>
+        <div>
+          {{ price_form(form.price_formset.empty_form) }}
+        </div>
       </template>
-      {% if user.has_perm("counter.change_product") %}
       <button class="btn btn-grey" @click.prevent="addForm()">
         <i class="fa fa-plus"></i> {% trans %}Add a price{% endtrans %}
       </button>
-      {% endif %}
     </div>
 
     <br />
@@ -172,16 +165,11 @@
       <template x-ref="formTemplate">
         {{ action_form(form.action_formset.empty_form) }}
       </template>
-      {% if user.has_perm("counter.change_product") %}
       <button @click.prevent="addForm()" class="btn btn-grey">
         <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
       </button>
-      {% endif %}
     </div>
     <div class="row gap margin-bottom">{{ form.archived.as_field_group() }}</div>
-
-    {% if user.has_perm("counter.change_product") %}
     <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-    {% endif %}
   </form>
 {% endblock %}

counter/templates/counter/product_list.jinja

@@ -80,11 +80,9 @@
     <h3 class="margin-bottom">{% trans %}Product list{% endtrans %}</h3>
 
     <div class="row margin-bottom">
-      {% if user.has_perm("counter.add_product") %}
       <a href="{{ url('counter:new_product') }}" class="btn btn-blue">
         {% trans %}New product{% endtrans %} <i class="fa fa-plus"></i>
       </a>
-      {% endif %}
       <button
         class="btn btn-blue"
         @click="downloadCsv()"

counter/templates/counter/product_type_list.jinja

@@ -13,12 +13,12 @@
 {% endblock %}
 
 {% block content %}
-  {% if user.has_perm("counter.add_producttype") %}
+  <p>
-    <a href="{{ url('counter:new_product_type') }}" class="btn btn-blue margin-bottom">
+    <a href="{{ url('counter:new_product_type') }}" class="btn btn-blue">
       {% trans %}New product type{% endtrans %}
       <i class="fa fa-plus"></i>
     </a>
-  {% endif %}
+  </p>
   {% if product_types %}
     <aside>
       <p>

counter/views/admin.py

@@ -48,7 +48,7 @@ from counter.models import (
     Selling,
 )
 from counter.utils import is_logged_in_counter
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
 class CounterListView(CounterAdminTabsMixin, CanViewMixin, ListView):
@@ -84,18 +84,17 @@ class CounterEditView(
         return reverse_lazy("counter:admin", kwargs={"counter_id": self.object.id})
 
 
-class CounterEditPropView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class CounterEditPropView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
-    """Edit a counter's main infos."""
+    """Edit a counter's main informations (for the counter's admin)."""
 
     model = Counter
     form_class = modelform_factory(Counter, fields=["name", "club", "type"])
     pk_url_kwarg = "counter_id"
     template_name = "core/edit.jinja"
     current_tab = "counters"
-    permission_required = "counter.change_counter"
 
 
-class CounterCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class CounterCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """Create a counter (for the admins)."""
 
     model = Counter
@@ -106,10 +105,9 @@ class CounterCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateVi
     )
     template_name = "core/create.jinja"
     current_tab = "counters"
-    permission_required = "counter.add_counter"
 
 
-class CounterDeleteView(CounterAdminTabsMixin, PermissionRequiredMixin, DeleteView):
+class CounterDeleteView(CounterAdminTabsMixin, CounterAdminMixin, DeleteView):
     """Delete a counter (for the admins)."""
 
     model = Counter
@@ -117,33 +115,30 @@ class CounterDeleteView(CounterAdminTabsMixin, PermissionRequiredMixin, DeleteVi
     template_name = "core/delete_confirm.jinja"
     success_url = reverse_lazy("counter:admin_list")
     current_tab = "counters"
-    permission_required = "counter.delete_counter"
 
 
 # Product management
 
 
-class ProductTypeListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
+class ProductTypeListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """A list view for the admins."""
 
     model = ProductType
     template_name = "counter/product_type_list.jinja"
     current_tab = "product_types"
     context_object_name = "product_types"
-    permission_required = "counter.view_producttype"
 
 
-class ProductTypeCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class ProductTypeCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = ProductType
     fields = ["name", "description", "comment", "icon"]
     template_name = "core/create.jinja"
     current_tab = "products"
-    permission_required = "counter.add_producttype"
 
 
-class ProductTypeEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class ProductTypeEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = ProductType
@@ -151,26 +146,23 @@ class ProductTypeEditView(CounterAdminTabsMixin, PermissionRequiredMixin, Update
     fields = ["name", "description", "comment", "icon"]
     pk_url_kwarg = "type_id"
     current_tab = "products"
-    permission_required = "counter.change_producttype"
 
 
-class ProductListView(CounterAdminTabsMixin, PermissionRequiredMixin, TemplateView):
+class ProductListView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
     current_tab = "products"
     template_name = "counter/product_list.jinja"
-    permission_required = "counter.view_product"
 
 
-class ProductCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = Product
     form_class = ProductForm
     template_name = "counter/product_form.jinja"
     current_tab = "products"
-    permission_required = "counter.add_product"
 
 
-class ProductEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = Product
@@ -178,13 +170,6 @@ class ProductEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
     pk_url_kwarg = "product_id"
     template_name = "counter/product_form.jinja"
     current_tab = "products"
-    permission_required = "counter.change_product"
-
-    def has_permission(self):
-        return self.request.user.has_perm("counter.change_product") or (
-            self.request.method == "GET"
-            and self.request.user.has_perm("counter.view_product")
-        )
 
 
 class ProductFormulaListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
@@ -314,6 +299,7 @@ class RefillingDeleteView(DeleteView):
     template_name = "core/delete_confirm.jinja"
 
     def dispatch(self, request, *args, **kwargs):
+        """We have here a very particular right handling, we can't inherit from CanEditPropMixin."""
         self.object = self.get_object()
         if timezone.now() - self.object.date <= timedelta(
             minutes=settings.SITH_LAST_OPERATIONS_LIMIT
@@ -338,6 +324,7 @@ class SellingDeleteView(DeleteView):
     template_name = "core/delete_confirm.jinja"
 
     def dispatch(self, request, *args, **kwargs):
+        """We have here a very particular right handling, we can't inherit from CanEditPropMixin."""
         self.object = self.get_object()
         if timezone.now() - self.object.date <= timedelta(
             minutes=settings.SITH_LAST_OPERATIONS_LIMIT
@@ -389,23 +376,23 @@ class CounterStatView(PermissionRequiredMixin, DetailView):
         return kwargs
 
 
-class CounterRefillingListView(
+class CounterRefillingListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
-    CounterAdminTabsMixin, PermissionRequiredMixin, ListView
-):
     """List of refillings on a counter."""
 
     model = Refilling
     template_name = "counter/refilling_list.jinja"
     current_tab = "counters"
     paginate_by = 30
-    permission_required = "counter.view_refilling"
 
-    def get_queryset(self):
+    def dispatch(self, request, *args, **kwargs):
-        self.counter = get_object_or_404(Counter, pk=self.kwargs["counter_id"])
+        self.counter = get_object_or_404(Counter, pk=kwargs["counter_id"])
-        return Refilling.objects.filter(counter=self.counter).order_by("-date")
+        self.queryset = Refilling.objects.filter(counter__id=self.counter.id)
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"counter": self.counter}
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["counter"] = self.counter
+        return kwargs
 
 
 class RefoundAccountView(UserPassesTestMixin, FormView):

counter/views/eticket.py

@@ -12,7 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from django.contrib.auth.mixins import PermissionRequiredMixin
+
 from django.http import Http404, HttpResponse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
@@ -21,30 +21,28 @@ from django.views.generic.edit import CreateView, UpdateView
 from core.auth.mixins import CanViewMixin
 from counter.forms import EticketForm
 from counter.models import Eticket, Selling
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
-class EticketListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
+class EticketListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """A list view for the admins."""
 
     model = Eticket
     template_name = "counter/eticket_list.jinja"
     ordering = ["id"]
     current_tab = "etickets"
-    permission_required = "counter.view_eticket"
 
 
-class EticketCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class EticketCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """Create an eticket."""
 
     model = Eticket
     template_name = "core/create.jinja"
     form_class = EticketForm
     current_tab = "etickets"
-    permission_required = "counter.add_eticket"
 
 
-class EticketEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class EticketEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """Edit an eticket."""
 
     model = Eticket
@@ -52,7 +50,6 @@ class EticketEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
     form_class = EticketForm
     pk_url_kwarg = "eticket_id"
     current_tab = "etickets"
-    permission_required = "counter.change_eticket"
 
 
 class EticketPDFView(CanViewMixin, DetailView):

counter/views/mixins.py

@@ -13,13 +13,38 @@
 #
 #
 
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
+from django.views.generic.base import View
 
 from core.views.mixins import TabedViewMixin
 from counter.utils import is_logged_in_counter
 
 
+class CounterAdminMixin(View):
+    """Protect counter admin section."""
+
+    edit_group = [settings.SITH_GROUP_COUNTER_ADMIN_ID]
+    edit_club = []
+
+    def _test_group(self, user):
+        return any(user.is_in_group(pk=grp_id) for grp_id in self.edit_group)
+
+    def _test_club(self, user):
+        return any(c.can_be_edited_by(user) for c in self.edit_club)
+
+    def dispatch(self, request, *args, **kwargs):
+        if not (
+            request.user.is_root
+            or self._test_group(request.user)
+            or self._test_club(request.user)
+        ):
+            raise PermissionDenied
+        return super().dispatch(request, *args, **kwargs)
+
+
 class CounterTabsMixin(TabedViewMixin):
     def get_tabs_title(self):
         return self.object
@@ -64,70 +89,45 @@ class CounterTabsMixin(TabedViewMixin):
 
 class CounterAdminTabsMixin(TabedViewMixin):
     tabs_title = _("Counter administration")
-
+    list_of_tabs = [
-    def get_list_of_tabs(self):
-        user = self.request.user
-        res = [
         {
             "url": reverse_lazy("counter:admin_list"),
             "slug": "counters",
             "name": _("Counters"),
-            }
+        },
-        ]
-        if user.has_perm("counter.view_product"):
-            res.append(
         {
             "url": reverse_lazy("counter:product_list"),
             "slug": "products",
             "name": _("Products"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_productformula"):
-            res.append(
         {
             "url": reverse_lazy("counter:product_formula_list"),
             "slug": "formulas",
             "name": _("Formulas"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_producttype"):
-            res.append(
         {
             "url": reverse_lazy("counter:product_type_list"),
             "slug": "product_types",
             "name": _("Product types"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_returnableproduct"):
-            res.append(
         {
             "url": reverse_lazy("counter:returnable_list"),
             "slug": "returnable_products",
             "name": _("Returnable products"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_cashregistersummary"):
-            res.append(
         {
             "url": reverse_lazy("counter:cash_summary_list"),
             "slug": "cash_summary",
             "name": _("Cash register summaries"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_invoicecall"):
-            res.append(
         {
             "url": reverse_lazy("counter:invoices_call"),
             "slug": "invoices_call",
             "name": _("Invoices call"),
-                }
+        },
-            )
-        if user.has_perm("counter.view_eticket"):
-            res.append(
         {
             "url": reverse_lazy("counter:eticket_list"),
             "slug": "etickets",
             "name": _("Etickets"),
-                }
+        },
-            )
+    ]
-        return res

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-09 21:44+0200\n"
+"POT-Creation-Date: 2026-10-02 12:56+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -236,7 +236,7 @@ msgstr "vous devez spécifier au moins un utilisateur ou une adresse email"
 msgid "Begin date"
 msgstr "Date de début"
 
-#: club/forms.py com/forms.py counter/forms.py
+#: club/forms.py com/forms.py counter/forms.py subscription/forms.py
 msgid "End date"
 msgstr "Date de fin"
 
@@ -1093,7 +1093,7 @@ msgstr "Prix d'achat"
 msgid "Format: 16:9 | Resolution: 1920x1080"
 msgstr "Format : 16:9 | Résolution : 1920x1080"
 
-#: com/forms.py
+#: com/forms.py subscription/forms.py
 msgid "Start date"
 msgstr "Date de début"
 
@@ -4102,6 +4102,7 @@ msgstr "Nouvelle formule"
 #: counter/templates/counter/fragments/create_student_card.jinja
 #: counter/templates/counter/invoices_call.jinja
 #: sas/templates/sas/picture.jinja
+#: subscription/templates/subscription/stats.jinja
 msgid "Go"
 msgstr "Valider"
 
@@ -4236,12 +4237,9 @@ msgid "Remove price"
 msgstr "Retirer le prix"
 
 #: counter/templates/counter/product_form.jinja
-msgid ""
+#, python-format
-"You can see product details. However, you cannot edit it, thus you won't be "
+msgid "Edit product %(name)s"
-"able to submit this form."
+msgstr "Édition du produit %(name)s"
-msgstr ""
-"Vous pouvez voir ce produit. Cependant, vous ne pouvez pas l'éditer ; vous "
-"ne serez donc pas en mesure de soumettre le formulaire."
 
 #: counter/templates/counter/product_form.jinja
 msgid "Creation date"
@@ -5987,8 +5985,12 @@ msgid "Create another subscription"
 msgstr "Créer une nouvelle cotisation"
 
 #: subscription/templates/subscription/stats.jinja
-msgid "All subscriptions"
+msgid "Total subscriptions"
-msgstr "Toutes les cotisations"
+msgstr "Cotisations totales"
+
+#: subscription/templates/subscription/stats.jinja
+msgid "Subscriptions by type"
+msgstr "Cotisations par type"
 
 #: subscription/templates/subscription/subscription.jinja
 msgid "Existing member"