Bump vite from 6.3.5 to 6.3.6

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.3.5 to 6.3.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.3.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.3.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.3.6
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

club/templates/club/club_detail.jinja

@@ -1,14 +1,6 @@
 {% extends "core/base.jinja" %}
 {% from 'core/macros.jinja' import user_profile_link %}
 
-{% block title -%}
-  {{ club.name }}
-{%- endblock %}
-
-{% block description -%}
-  {{ club.short_description }}
-{%- endblock %}
-
 {% block content %}
   <div id="club_detail">
     {% if club.logo %}

club/templates/club/club_list.jinja

@@ -1,12 +1,8 @@
 {% extends "core/base.jinja" %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Club list{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}The list of all clubs existing at UTBM.{% endtrans %}
-{%- endblock %}
 
 {% macro display_club(club) -%}
 
@@ -25,7 +21,7 @@
 
   {%- if club.children.all()|length != 0 %}
     <ul>
-      {%- for c in club.children.order_by('name').prefetch_related("children") %}
+      {%- for c in club.children.order_by('name') %}
         {{ display_club(c) }}
       {%- endfor %}
     </ul>
@@ -40,8 +36,8 @@
   {% if club_list %}
     <h3>{% trans %}Club list{% endtrans %}</h3>
     <ul>
-      {%- for club in club_list %}
+      {%- for c in club_list.all().order_by('name') if c.parent is none %}
-        {{ display_club(club) }}
+        {{ display_club(c) }}
       {%- endfor %}
     </ul>
   {% else %}

club/views.py

@@ -171,10 +171,6 @@ class ClubListView(ListView):
 
     model = Club
     template_name = "club/club_list.jinja"
-    queryset = (
-        Club.objects.filter(parent=None).order_by("name").prefetch_related("children")
-    )
-    context_object_name = "club_list"
 
 
 class ClubView(ClubTabsMixin, DetailView):

com/ics_calendar.py

@@ -68,7 +68,7 @@ class IcsCalendar:
                 start=news_date.start_date,
                 end=news_date.end_date,
                 url=as_absolute_url(
-                    reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
+                    reverse("com:news_detail", kwargs={"news_id": news_date.news.id})
                 ),
             )
             calendar.events.append(event)

com/models.py

@@ -27,7 +27,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.mail import EmailMultiAlternatives
 from django.db import models, transaction
-from django.db.models import Exists, F, OuterRef, Q
+from django.db.models import F, Q
 from django.shortcuts import render
 from django.templatetags.static import static
 from django.urls import reverse
@@ -55,17 +55,9 @@ class Sith(models.Model):
 
 
 class NewsQuerySet(models.QuerySet):
-    def published(self) -> Self:
+    def moderated(self) -> Self:
         return self.filter(is_published=True)
 
-    def waiting_moderation(self) -> Self:
-        """Filter all non-finished non-published news"""
-        # Because of the way News and NewsDates are created,
-        # there may be some cases where this method is called before
-        # the NewsDates linked to a Date are actually persisted in db.
-        # Thus, it's important to filter by "not past date" rather than by "future date"
-        return self.filter(~Q(dates__start_date__lt=timezone.now()), is_published=False)
-
     def viewable_by(self, user: User) -> Self:
         """Filter news that the given user can view.
 
@@ -135,28 +127,20 @@ class News(models.Model):
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
-        if not self.is_published:
+        if self.is_published:
-            admins_without_notif = User.objects.filter(
+            return
-                ~Exists(
+        for user in User.objects.filter(
-                    Notification.objects.filter(
+            groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
-                        user=OuterRef("pk"), type="NEWS_MODERATION"
+        ):
+            Notification.objects.create(
+                user=user, url=reverse("com:news_admin_list"), type="NEWS_MODERATION"
             )
-                ),
-                groups__id=settings.SITH_GROUP_COM_ADMIN_ID,
-            )
-            notif_url = reverse("com:news_admin_list")
-            new_notifs = [
-                Notification(user=user, url=notif_url, type="NEWS_MODERATION")
-                for user in admins_without_notif
-            ]
-            Notification.objects.bulk_create(new_notifs)
-        self.update_moderation_notifs()
 
     def get_absolute_url(self):
         return reverse("com:news_detail", kwargs={"news_id": self.id})
 
     def get_full_url(self):
-        return f"https://{settings.SITH_URL}{self.get_absolute_url()}"
+        return "https://%s%s" % (settings.SITH_URL, self.get_absolute_url())
 
     def is_owned_by(self, user):
         if user.is_anonymous:
@@ -175,16 +159,19 @@ class News(models.Model):
             or (user.is_authenticated and self.author_id == user.id)
         )
 
-    @staticmethod
+
-    def update_moderation_notifs():
+def news_notification_callback(notif: Notification):
-        count = News.objects.waiting_moderation().count()
+    # the NewsDate linked to the News
-        notifs_qs = Notification.objects.filter(
+    # which creation triggered this callback may not exist yet,
-            type="NEWS_MODERATION", user__groups__id=settings.SITH_GROUP_COM_ADMIN_ID
+    # so it's important to filter by "not past date" rather than by "future date"
-        )
+    count = News.objects.filter(
+        ~Q(dates__start_date__gt=timezone.now()), is_published=False
+    ).count()
     if count:
-            notifs_qs.update(viewed=False, param=str(count))
+        notif.viewed = False
+        notif.param = str(count)
     else:
-            notifs_qs.update(viewed=True)
+        notif.viewed = True
 
 
 class NewsDateQuerySet(models.QuerySet):

com/templates/com/news_list.jinja

@@ -1,6 +1,10 @@
 {% extends "core/base.jinja" %}
 {% from "com/macros.jinja" import news_moderation_alert %}
 
+{% block title %}
+  {% trans %}News{% endtrans %}
+{% endblock %}
+
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
   <link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">

com/tests/test_notifications.py

@@ -1,22 +1,13 @@
-from datetime import timedelta
-
 import pytest
 from django.conf import settings
-from django.utils.timezone import now
 from model_bakery import baker
 
-from com.models import News, NewsDate
+from com.models import News
-from core.baker_recipes import subscriber_user
 from core.models import Group, Notification, User
 
 
 @pytest.mark.django_db
 def test_notification_created():
-    # this news is unpublished, but is set in the past
-    # it shouldn't be taken into account when counting the number
-    # of news that are to be moderated
-    past_news = baker.make(News, is_published=False)
-    baker.make(NewsDate, news=past_news, start_date=now() - timedelta(days=1))
     com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
     com_admin_group.users.all().delete()
     Notification.objects.all().delete()
@@ -24,28 +15,9 @@ def test_notification_created():
     for i in range(2):
         # news notifications are permanent, so the notification created
         # during the first iteration should be reused during the second one.
-        baker.make(News, is_published=False)
+        baker.make(News)
         notifications = list(Notification.objects.all())
         assert len(notifications) == 1
         assert notifications[0].user == com_admin
         assert notifications[0].type == "NEWS_MODERATION"
         assert notifications[0].param == str(i + 1)
-
-
-@pytest.mark.django_db
-def test_notification_edited_when_moderating_news():
-    com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
-    com_admins = subscriber_user.make(_quantity=3)
-    com_admin_group.users.set(com_admins)
-    Notification.objects.all().delete()
-    news = baker.make(News, is_published=False)
-    assert Notification.objects.count() == 3
-    assert Notification.objects.filter(viewed=False).count() == 3
-
-    news.is_published = True
-    news.moderator = com_admins[0]
-    news.save()
-    # when the news is moderated, the notification should be marked as read
-    # for all admins
-    assert Notification.objects.count() == 3
-    assert Notification.objects.filter(viewed=False).count() == 0

core/models.py

@@ -560,7 +560,7 @@ class User(AbstractUser):
         """Determine if the object is owned by the user."""
         if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
             return True
-        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group_id):
+        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group.id):
             return True
         return self.is_root
 
@@ -569,14 +569,8 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
             return True
         if hasattr(obj, "edit_groups"):
-            if (
+            for pk in obj.edit_groups.values_list("pk", flat=True):
-                hasattr(obj, "_prefetched_objects_cache")
+                if self.is_in_group(pk=pk):
-                and "edit_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.edit_groups.all()]
-            else:
-                pks = list(obj.edit_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
                     return True
         if isinstance(obj, User) and obj == self:
             return True
@@ -587,17 +581,8 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
             return True
         if hasattr(obj, "view_groups"):
-            # if "view_groups" has already been prefetched, use
+            for pk in obj.view_groups.values_list("pk", flat=True):
-            # the prefetch cache, else fetch only the ids, to make
+                if self.is_in_group(pk=pk):
-            # the query lighter.
-            if (
-                hasattr(obj, "_prefetched_objects_cache")
-                and "view_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.view_groups.all()]
-            else:
-                pks = list(obj.view_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
                     return True
         return self.can_edit(obj)
 
@@ -1399,9 +1384,9 @@ class Page(models.Model):
 
     @cached_property
     def is_club_page(self):
-        return (
+        club_root_page = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
-            self.name == settings.SITH_CLUB_ROOT_PAGE
+        return club_root_page is not None and (
-            or settings.SITH_CLUB_ROOT_PAGE in [p.name for p in self.get_parent_list()]
+            self == club_root_page or club_root_page in self.get_parent_list()
         )
 
     @cached_property

core/templates/core/base.jinja

@@ -2,14 +2,8 @@
 <html lang="fr">
   <head>
     {% block head %}
-      <title>{% block title %}Association des Étudiants de l'UTBM{% endblock %}</title>
+      <title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <meta name="description" content="{% block description -%}
-                                          {% trans trimmed %}
-                                            AE UTBM is a voluntary organisation run by UTBM students.
-                                            It organises student life at UTBM and manages its student facilities.
-                                          {% endtrans %}
-                                        {%- endblock %}">
       <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
       <link rel="stylesheet" href="{{ static('core/base.css') }}">
       <link rel="stylesheet" href="{{ static('core/style.scss') }}">

core/templates/core/page_list.jinja

@@ -5,12 +5,16 @@
 {% endblock %}
 
 {% block content %}
+  {% if page_list %}
     <h3>{% trans %}Page list{% endtrans %}</h3>
     <ul>
       {% for p in page_list %}
-      <li><a href="{{ p.get_absolute_url() }}">{{ p.display_name }}</a></li>
+        <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
       {% endfor %}
     </ul>
+  {% else %}
+    {% trans %}There is no page in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 

core/views/page.py

@@ -12,10 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.db.models import F, OuterRef, Subquery
-from django.db.models.functions import Coalesce
 
 # This file contains all the views that concern the page model
 from django.forms.models import modelform_factory
@@ -46,20 +43,6 @@ class CanEditPagePropMixin(CanEditPropMixin):
 class PageListView(CanViewMixin, ListView):
     model = Page
     template_name = "core/page_list.jinja"
-    queryset = (
-        Page.objects.annotate(
-            display_name=Coalesce(
-                Subquery(
-                    PageRev.objects.filter(page=OuterRef("id"))
-                    .order_by("-date")
-                    .values("title")[:1]
-                ),
-                F("name"),
-            )
-        )
-        .prefetch_related("view_groups")
-        .select_related("parent")
-    )
 
 
 class PageView(CanViewMixin, DetailView):

counter/forms.py

@@ -1,19 +1,13 @@
 import math
 
 from django import forms
-from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from django_celery_beat.models import ClockedSchedule, PeriodicTask
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
 from club.widgets.ajax_select import AutoCompleteSelectClub
 from core.models import User
-from core.views.forms import (
+from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
-    NFCTextInput,
-    SelectDate,
-    SelectDateTime,
-)
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
     AutoCompleteSelectMultipleGroup,
@@ -164,66 +158,6 @@ class CounterEditForm(forms.ModelForm):
         }
 
 
-class ProductArchiveForm(forms.Form):
-    """Form for automatic product archiving."""
-
-    enabled = forms.BooleanField(
-        label=_("Enabled"),
-        widget=forms.CheckboxInput(attrs={"class": "switch"}),
-        required=False,
-    )
-    archive_at = forms.DateTimeField(
-        label=_("Date and time of archiving"), widget=SelectDateTime, required=False
-    )
-
-    def __init__(self, *args, product: Product, **kwargs):
-        self.product = product
-        self.instance = PeriodicTask.objects.filter(
-            task="counter.tasks.archive_product", args=f"[{product.id}]"
-        ).first()
-        super().__init__(*args, **kwargs)
-        if self.instance:
-            self.fields["enabled"].initial = self.instance.enabled
-            self.fields["archive_at"].initial = self.instance.clocked.clocked_time
-
-    def clean(self):
-        cleaned_data = super().clean()
-        if cleaned_data["enabled"] is True and cleaned_data["archive_at"] is None:
-            raise ValidationError(
-                _(
-                    "Automatic archiving cannot be enabled "
-                    "without providing a archiving date."
-                )
-            )
-
-    def save(self):
-        if not self.changed_data:
-            return
-        if not self.instance:
-            PeriodicTask.objects.create(
-                task="counter.tasks.archive_product",
-                args=f"[{self.product.id}]",
-                name=f"Archive product {self.product}",
-                clocked=ClockedSchedule.objects.create(
-                    clocked_time=self.cleaned_data["archive_at"]
-                ),
-                enabled=self.cleaned_data["enabled"],
-                one_off=True,
-            )
-            return
-        if (
-            "archive_at" in self.changed_data
-            and self.cleaned_data["archive_at"] is None
-        ):
-            self.instance.delete()
-        elif "archive_at" in self.changed_data:
-            self.instance.clocked.clocked_time = self.cleaned_data["archive_at"]
-            self.instance.clocked.save()
-        self.instance.enabled = self.cleaned_data["enabled"]
-        self.instance.save()
-        return self.instance
-
-
 class ProductEditForm(forms.ModelForm):
     error_css_class = "error"
     required_css_class = "required"
@@ -265,19 +199,22 @@ class ProductEditForm(forms.ModelForm):
         queryset=Counter.objects.all(),
     )
 
-    def __init__(self, *args, instance=None, **kwargs):
+    def __init__(self, *args, **kwargs):
-        super().__init__(*args, instance=instance, **kwargs)
+        super().__init__(*args, **kwargs)
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
-        self.archive_form = ProductArchiveForm(*args, product=self.instance, **kwargs)
-
-    def is_valid(self):
-        return super().is_valid() and self.archive_form.is_valid()
 
     def save(self, *args, **kwargs):
         ret = super().save(*args, **kwargs)
-        self.instance.counters.set(self.cleaned_data["counters"])
+        if self.fields["counters"].initial:
-        self.archive_form.save()
+            # Remove the product from all counter it was added to
+            # It will then only be added to selected counters
+            for counter in self.fields["counters"].initial:
+                counter.products.remove(self.instance)
+                counter.save()
+        for counter in self.cleaned_data["counters"]:
+            counter.products.add(self.instance)
+            counter.save()
         return ret
 
 

counter/models.py

@@ -445,8 +445,7 @@ class Product(models.Model):
         buying_groups = list(self.buying_groups.all())
         if not buying_groups:
             return True
-        res = any(user.is_in_group(pk=group.id) for group in buying_groups)
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
-        return res
 
     @property
     def profit(self):

counter/tasks.py

@@ -1,13 +0,0 @@
-# Create your tasks here
-
-from celery import shared_task
-
-from counter.models import Product
-
-
-@shared_task
-def archive_product(product_id):
-    product = Product.objects.get(id=product_id)
-    product.archived = True
-    product.save()
-    product.counters.clear()

counter/templates/counter/product_form.jinja

@@ -1,31 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-  {% if object %}
-    <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
-  {% else %}
-    <h2>{% trans %}Product creation{% endtrans %}</h2>
-  {% endif %}
-  <form method="post">
-    {% csrf_token %}
-    {{ form.as_p() }}
-
-    <br />
-
-    <h3>{% trans %}Automatic archiving{% endtrans %}</h3>
-
-    <p>
-      <em>
-        {%- trans trimmed -%}
-          Automatic archiving allows you to mark a product as archived
-          and remove it from all its counters at a specified time and date.
-        {%- endtrans -%}
-      </em>
-    </p>
-
-    <fieldset x-data="{enabled: {{ form.archive_form.enabled.initial|tojson }}}">
-      {{ form.archive_form.as_p() }}
-    </fieldset>
-    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-  </form>
-{% endblock %}

counter/views/admin.py

@@ -147,7 +147,7 @@ class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
 
     model = Product
     form_class = ProductEditForm
-    template_name = "counter/product_form.jinja"
+    template_name = "core/create.jinja"
     current_tab = "products"
 
 
@@ -157,7 +157,7 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     model = Product
     form_class = ProductEditForm
     pk_url_kwarg = "product_id"
-    template_name = "counter/product_form.jinja"
+    template_name = "core/edit.jinja"
     current_tab = "products"
 
 

eboutic/templates/eboutic/eboutic_main.jinja

@@ -1,12 +1,8 @@
 {% extends "core/base.jinja" %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Eboutic{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}The online shop of the association.{% endtrans %}
-{%- endblock %}
 
 {% block additional_js %}
     {# This script contains the code to perform requests to manipulate the

forum/templates/forum/main.jinja

@@ -2,13 +2,9 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 {% from 'forum/macros.jinja' import display_forum, display_search_bar %}
 
-{% block title -%}
+{% block title %}
   {% trans %}Forum{% endtrans %}
-{%- endblock %}
+{% endblock %}
-
-{% block description -%}
-  {% trans %}A forum dedicated to the UTBM students.{% endtrans %}
-{%- endblock %}
 
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('forum/css/forum.scss') }}">

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-14 01:35+0200\n"
+"POT-Creation-Date: 2025-08-23 15:30+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"
@@ -306,10 +306,6 @@ msgstr "Utilisateur non enregistré"
 msgid "Club list"
 msgstr "Liste des clubs"
 
-#: club/templates/club/club_list.jinja
-msgid "The list of all clubs existing at UTBM."
-msgstr "La liste de tous les clubs existants à l'UTBM"
-
 #: club/templates/club/club_list.jinja
 msgid "inactive"
 msgstr "inactif"
@@ -561,7 +557,6 @@ msgstr ""
 #: core/templates/core/user_godfathers_tree.jinja
 #: core/templates/core/user_preferences.jinja
 #: counter/templates/counter/cash_register_summary.jinja
-#: counter/templates/counter/product_form.jinja
 #: forum/templates/forum/reply.jinja
 #: subscription/templates/subscription/fragments/creation_form.jinja
 #: trombi/templates/trombi/comment.jinja
@@ -906,7 +901,7 @@ msgid "News admin"
 msgstr "Administration des nouvelles"
 
 #: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja
-#: com/views.py
+#: com/templates/com/news_list.jinja com/views.py
 msgid "News"
 msgstr "Nouvelles"
 
@@ -1040,7 +1035,7 @@ msgstr "Liens"
 msgid "Our services"
 msgstr "Nos services"
 
-#: com/templates/com/news_list.jinja
+#: com/templates/com/news_list.jinja pedagogy/templates/pedagogy/guide.jinja
 msgid "UV Guide"
 msgstr "Guide des UVs"
 
@@ -1710,12 +1705,8 @@ msgid "500, Server Error"
 msgstr "500, Erreur Serveur"
 
 #: core/templates/core/base.jinja
-msgid ""
+msgid "Welcome!"
-"AE UTBM is a voluntary organisation run by UTBM students. It organises "
+msgstr "Bienvenue !"
-"student life at UTBM and manages its student facilities."
-msgstr ""
-"L'AE UTBM est une association bénévole gérée par les étudiants de l'UTBM. "
-"Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
 
 #: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
 msgid "Contacts"
@@ -2158,6 +2149,10 @@ msgstr ""
 msgid "Page history"
 msgstr "Historique de la page"
 
+#: core/templates/core/page_list.jinja
+msgid "There is no page in this website."
+msgstr "Il n'y a pas de page sur ce site web."
+
 #: core/templates/core/page_prop.jinja
 msgid "Page properties"
 msgstr "Propriétés de la page"
@@ -2893,20 +2888,6 @@ msgstr "Cet UID est invalide"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: counter/forms.py
-msgid "Enabled"
-msgstr "Activé"
-
-#: counter/forms.py
-msgid "Date and time of archiving"
-msgstr "Date et heure de l'archivage"
-
-#: counter/forms.py
-msgid ""
-"Automatic archiving cannot be enabled without providing a archiving date."
-msgstr ""
-"L'archivage automatique ne peut pas activé sans fournir une date d'archivage."
-
 #: counter/forms.py
 msgid ""
 "Describe the product. If it's an event's click, give some insights about it, "
@@ -3559,29 +3540,6 @@ msgstr ""
 "votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
 "aucune conséquence autre que le retrait de l'argent de votre compte."
 
-#: counter/templates/counter/product_form.jinja
-#, python-format
-msgid "Edit product %(name)s"
-msgstr "Édition du produit %(name)s"
-
-#: counter/templates/counter/product_form.jinja
-#, fuzzy
-#| msgid "Product state"
-msgid "Product creation"
-msgstr "Etat du produit"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Automatic archiving"
-msgstr "Archivage automatique"
-
-#: counter/templates/counter/product_form.jinja
-msgid ""
-"Automatic archiving allows you to mark a product as archived and remove it "
-"from all its counters at a specified time and date."
-msgstr ""
-"L'archivage automatique permet de marquer un produit comme archivé et de le "
-"retirer de tous ses comptoirs à une heure et une date voulues."
-
 #: counter/templates/counter/product_list.jinja
 msgid "Product list"
 msgstr "Liste des produits"
@@ -3861,10 +3819,6 @@ msgstr ""
 msgid "Pay with Sith account"
 msgstr "Payer avec un compte AE"
 
-#: eboutic/templates/eboutic/eboutic_main.jinja
-msgid "The online shop of the association."
-msgstr "La boutique en ligne de l'association."
-
 #: eboutic/templates/eboutic/eboutic_main.jinja
 msgid "Clear"
 msgstr "Vider"
@@ -4194,10 +4148,6 @@ msgstr "Message supprimé ou non-visible."
 msgid "Order by date"
 msgstr "Trier par date"
 
-#: forum/templates/forum/main.jinja
-msgid "A forum dedicated to the UTBM students."
-msgstr "Un forum dédié aux étudiants de l'UTBM."
-
 #: forum/templates/forum/main.jinja
 msgid "View last unread messages"
 msgstr "Voir les derniers messages non lus"
@@ -4424,14 +4374,6 @@ msgstr "signaler"
 msgid "reporter"
 msgstr "signalant"
 
-#: pedagogy/templates/pedagogy/guide.jinja
-msgid "UE Guide"
-msgstr "Guide des UEs"
-
-#: pedagogy/templates/pedagogy/guide.jinja
-msgid "A guide of courses available at UTBM."
-msgstr "Un guide de tous les cours disponibles à l'UTBM."
-
 #: pedagogy/templates/pedagogy/guide.jinja
 #, python-format
 msgid "%(display_name)s"
@@ -4724,11 +4666,6 @@ msgstr "Demande de retrait d'image"
 msgid "Request removal"
 msgstr "Demander le retrait"
 
-#: sas/templates/sas/main.jinja
-msgid "See all the photos taken during events organised by the AE."
-msgstr ""
-"Retrouvez toutes les photos prises lors des événements organisés par l'AE."
-
 #: sas/templates/sas/main.jinja
 msgid "You must be logged in to see the SAS."
 msgstr "Vous devez être connecté pour voir les photos."

package-lock.json

@@ -50,7 +50,7 @@
         "@types/jquery": "^3.5.31",
         "@types/js-cookie": "^3.0.6",
         "typescript": "^5.8.3",
-        "vite": "^6.2.6",
+        "vite": "^6.3.6",
         "vite-bundle-visualizer": "^1.2.1",
         "vite-plugin-static-copy": "^3.1.2"
       }
@@ -5737,9 +5737,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.3.5",
+      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -35,7 +35,7 @@
     "@types/jquery": "^3.5.31",
     "@types/js-cookie": "^3.0.6",
     "typescript": "^5.8.3",
-    "vite": "^6.2.6",
+    "vite": "^6.3.6",
     "vite-bundle-visualizer": "^1.2.1",
     "vite-plugin-static-copy": "^3.1.2"
   },

pedagogy/templates/pedagogy/guide.jinja

@@ -2,13 +2,9 @@
 {% from 'core/macros.jinja' import paginate_alpine %}
 
 {% block title %}
-  {% trans %}UE Guide{% endtrans %}
+  {% trans %}UV Guide{% endtrans %}
 {% endblock %}
 
-{% block description -%}
-  {% trans %}A guide of courses available at UTBM.{% endtrans %}
-{%- endblock %}
-
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('pedagogy/css/pedagogy.scss') }}">
 {% endblock %}

sas/templates/sas/main.jinja

@@ -8,10 +8,6 @@
   {% trans %}SAS{% endtrans %}
 {% endblock %}
 
-{% block description -%}
-  {% trans %}See all the photos taken during events organised by the AE.{% endtrans %}
-{%- endblock %}
-
 {% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
 
 {% from "sas/macros.jinja" import display_album %}

sith/settings.py

@@ -99,10 +99,9 @@ INSTALLED_APPS = (
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
-    "django.contrib.sitemaps",
-    "django.contrib.sites",
     "django.contrib.messages",
     "staticfiles",
+    "django.contrib.sites",
     "honeypot",
     "django_jinja",
     "ninja_extra",
@@ -687,10 +686,8 @@ SITH_NOTIFICATIONS = [
 # The keys are the notification names as found in SITH_NOTIFICATIONS, and the
 # values are the callback function to update the notifs.
 # The callback must take the notif object as first and single argument.
-# If a notification is permanent but requires no post-action, set the
-# callback import string as None
 SITH_PERMANENT_NOTIFICATIONS = {
-    "NEWS_MODERATION": None,
+    "NEWS_MODERATION": "com.models.news_notification_callback",
     "SAS_MODERATION": "sas.models.sas_notification_callback",
 }
 

sith/sitemap.py

@@ -1,46 +0,0 @@
-from django.conf import settings
-from django.contrib.sitemaps import Sitemap
-from django.db.models import OuterRef, Subquery
-from django.urls import reverse
-
-from club.models import Club
-from core.models import Page, PageRev
-
-
-class SithSitemap(Sitemap):
-    def items(self):
-        return [
-            "core:index",
-            "eboutic:main",
-            "sas:main",
-            "forum:main",
-            "club:club_list",
-            "election:list",
-        ]
-
-    def location(self, item):
-        return reverse(item)
-
-
-class PagesSitemap(Sitemap):
-    def items(self):
-        return (
-            Page.objects.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
-            .exclude(revisions=None, _full_name__startswith="club")
-            .annotate(
-                lastmod=Subquery(
-                    PageRev.objects.filter(page=OuterRef("pk"))
-                    .values("date")
-                    .order_by("-date")[:1]
-                )
-            )
-            .all()
-        )
-
-    def lastmod(self, item: Page):
-        return item.lastmod
-
-
-class ClubSitemap(Sitemap):
-    def items(self):
-        return Club.objects.filter(is_active=True)

sith/urls.py

@@ -15,24 +15,20 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.contrib.sitemaps.views import sitemap
 from django.http import Http404
 from django.urls import include, path
-from django.views.decorators.cache import cache_page
 from django.views.i18n import JavaScriptCatalog
 
 from api.urls import api
-from sith.sitemap import ClubSitemap, PagesSitemap, SithSitemap
 
 js_info_dict = {"packages": ("sith",)}
 
 handler403 = "core.views.forbidden"
 handler404 = "core.views.not_found"
 handler500 = "core.views.internal_servor_error"
-sitemaps = {"sith": SithSitemap, "pages": PagesSitemap, "clubs": ClubSitemap}
+
 urlpatterns = [
     path("", include(("core.urls", "core"), namespace="core")),
-    path("sitemap.xml", cache_page(86400)(sitemap), {"sitemaps": sitemaps}),
     path("api/", api.urls),
     path("rootplace/", include(("rootplace.urls", "rootplace"), namespace="rootplace")),
     path(