add tests

show user stats to subscribers if show_my_stats is enabled

club/api.py

@@ -6,9 +6,10 @@ from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
 from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, CanView, HasPerm
+from api.permissions import CanView, HasPerm
 from club.models import Club, Membership
 from club.schemas import (
+    ClubProfileSchema,
     ClubSchema,
     ClubSearchFilterSchema,
     SimpleClubSchema,
@@ -22,13 +23,21 @@ class ClubController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[SimpleClubSchema],
-        auth=[ApiKeyAuth(), SessionAuth()],
-        permissions=[CanAccessLookup],
         url_name="search_club",
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_club(self, filters: Query[ClubSearchFilterSchema]):
-        return filters.filter(Club.objects.all())
+        return filters.filter(Club.objects.order_by("name")).values()
+
+    @route.get(
+        "/search-profile",
+        response=PaginatedResponseSchema[ClubProfileSchema],
+        url_name="search_club_profile",
+    )
+    @paginate(PageNumberPaginationExtra, page_size=50)
+    def search_club_profile(self, filters: Query[ClubSearchFilterSchema]):
+        """Same as /api/club/search, but with more returned data"""
+        return filters.filter(Club.objects.order_by("name"))
 
     @route.get(
         "/{int:club_id}",

club/schemas.py

@@ -30,7 +30,7 @@ class ClubProfileSchema(ModelSchema):
 
     class Meta:
         model = Club
-        fields = ["id", "name", "logo"]
+        fields = ["id", "name", "logo", "is_active", "short_description"]
 
     url: str
 

club/static/bundled/club/club-list-index.ts

@@ -0,0 +1,63 @@
+import { History, updateQueryString } from "#core:utils/history";
+import {
+  type ClubProfileSchema,
+  type ClubSearchClubData,
+  clubSearchClubProfile,
+  type Options,
+} from "#openapi";
+
+type ClubStatus = "active" | "inactive" | "both";
+const PAGE_SIZE = 50;
+
+document.addEventListener("alpine:init", () => {
+  Alpine.data("clubList", () => ({
+    clubName: "",
+    clubStatus: "active" as ClubStatus,
+    currentPage: 1,
+    nbPages: 1,
+    clubs: [] as ClubProfileSchema[],
+    loading: false,
+
+    async init() {
+      const urlParams = new URLSearchParams(window.location.search);
+      this.clubName = urlParams.get("clubName") || "";
+      this.clubStatus = urlParams.get("clubStatus") || "active";
+      this.currentPage = urlParams.get("currentPage") || 1;
+      for (const param of ["clubName", "clubStatus", "currentPage"]) {
+        this.$watch(param, async (value: number | string) => {
+          updateQueryString(param, value.toString(), History.Replace);
+          await this.loadClubs();
+        });
+      }
+      await this.loadClubs();
+    },
+    async loadClubs() {
+      this.loading = true;
+      const searchParams: Options<ClubSearchClubData> = {
+        query: { page: this.currentPage },
+      };
+      if (this.clubName) {
+        searchParams.query.search = this.clubName;
+      }
+      if (this.clubStatus === "active") {
+        searchParams.query.is_active = true;
+      } else if (this.clubStatus === "inactive") {
+        searchParams.query.is_active = false;
+      }
+      const res = await clubSearchClubProfile(searchParams);
+      this.nbPages = Math.ceil(res.data.count / PAGE_SIZE);
+      this.clubs = res.data.results;
+      this.loading = false;
+    },
+
+    getParagraphs(s: string) {
+      if (!s) {
+        return [];
+      }
+      return s
+        .split("\n")
+        .map((s) => s.trim())
+        .filter((s) => s !== "");
+    },
+  }));
+});

club/static/club/list.scss

@@ -0,0 +1,47 @@
+#club-list {
+  display: flex;
+  flex-direction: column;
+  gap: 2em;
+  padding: 2em;
+
+  .card {
+    display: block;
+    background-color: unset;
+
+    .club-image {
+      float: left;
+      margin-right: 2rem;
+      margin-bottom: .5rem;
+      width: 150px;
+      height: 150px;
+      border-radius: 10%;
+      background-color: rgba(173, 173, 173, 0.2);
+
+      @media screen and (max-width: 500px) {
+        width: 100px;
+        height: 100px;
+      }
+    }
+
+    i.club-image {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      color: black;
+    }
+
+    .content {
+      display: block;
+      text-align: justify;
+
+      h4 {
+        margin-top: 0;
+        margin-right: .5rem;
+      }
+
+      p {
+        font-size: 100%;
+      }
+    }
+  }
+}

club/templates/club/club_list.jinja

@@ -1,4 +1,5 @@
 {% extends "core/base.jinja" %}
+{% from "core/macros.jinja" import paginate_alpine %}
 
 {% block title -%}
   {% trans %}Club list{% endtrans %}
@@ -8,45 +9,76 @@
   {% trans %}The list of all clubs existing at UTBM.{% endtrans %}
 {%- endblock %}
 
-{% macro display_club(club) -%}
+{% block additional_js %}
+  <script type="module" src="{{ static("bundled/club/club-list-index.ts") }}"></script>
+{% endblock %}
 
-  {% if club.is_active or user.is_root %}
-
-    <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
-
-      {% if not club.is_active %}
-        ({% trans %}inactive{% endtrans %})
-      {% endif %}
-
-      {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
-      {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
-
-  {% endif %}
-
-  {%- if club.children.all()|length != 0 %}
-    <ul>
-      {%- for c in club.children.order_by('name').prefetch_related("children") %}
-        {{ display_club(c) }}
-      {%- endfor %}
-    </ul>
-  {%- endif -%}
-  </li>
-{%- endmacro %}
+{% block additional_css %}
+  <link rel="stylesheet" href="{{ static("club/list.scss") }}">
+{% endblock %}
 
 {% block content %}
-  {% if user.is_root %}
-    <p><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></p>
-  {% endif %}
-  {% if club_list %}
+  <main x-data="clubList">
+    <h3>{% trans %}Filters{% endtrans %}</h3>
+    <form id="club-list-filters">
+      <div class="row gap-4x">
+        <fieldset>
+          <label for="club-name-input">{% trans %}Name{% endtrans %}</label>
+          <input
+            id="club-name-input"
+            type="text"
+            name="club-name"
+            x-model.debounce.500ms="clubName"
+          />
+        </fieldset>
+        <fieldset class="grow">
+          <legend>{% trans %}Club state{% endtrans %}</legend>
+          <div class="row">
+            <input type="radio" id="filter-active-clubs" x-model="clubStatus" value="active">
+            <label for="filter-active-clubs">{% trans %}Active{% endtrans %}</label>
+          </div>
+          <div class="row">
+            <input type="radio" id="filter-inactive-clubs" x-model="clubStatus" value="inactive">
+            <label for="filter-inactive-clubs">{% trans %}Inactive{% endtrans %}</label>
+          </div>
+          <div class="row">
+            <input type="radio" id="filter-all-clubs" x-model="clubStatus" value="both">
+            <label for="filter-all-clubs">{% trans %}All clubs{% endtrans %}</label>
+          </div>
+        </fieldset>
+      </div>
+    </form>
     <h3>{% trans %}Club list{% endtrans %}</h3>
-    <ul>
-      {%- for club in club_list %}
-        {{ display_club(club) }}
-      {%- endfor %}
-    </ul>
-  {% else %}
-    {% trans %}There is no club in this website.{% endtrans %}
-  {% endif %}
+    {% if user.has_perm("club.add_club") %}
+      <br>
+      <a href="{{ url('club:club_new') }}" class="btn btn-blue">
+        <i class="fa fa-plus"></i> {% trans %}New club{% endtrans %}
+      </a>
+    {% endif %}
+    <section class="aria-busy-grow" :aria-busy="loading" id="club-list">
+      <template x-for="club of clubs" :key="club.id">
+        <div class="card">
+          <a :href="club.url">
+            <template x-if="club.logo">
+              <img class="club-image" :src="club.logo" :alt="`logo ${club.name}`">
+            </template>
+            <template x-if="!club.logo">
+              <i class="fa-regular fa-image fa-4x club-image"></i>
+            </template>
+          </a>
+          <div class="content">
+            <a :href="club.url">
+              <h4 x-text="`${club.name} ${club.is_active ? '' : '({% trans %}inactive{% endtrans %})'}`"></h4>
+            </a>
+            <template x-for="paragraph of getParagraphs(club.short_description)">
+              <p x-text="paragraph"></p>
+            </template>
+          </div>
+        </div>
+      </template>
+    </section>
+    {{ paginate_alpine("currentPage", "nbPages") }}
+  </main>
 {% endblock %}
 
 

club/tests/test_club.py

@@ -1,12 +1,15 @@
 from datetime import timedelta
 
 import pytest
+from django.test import Client
+from django.urls import reverse
 from django.utils.timezone import localdate
 from model_bakery import baker
 from model_bakery.recipe import Recipe
 
 from club.models import Club, Membership
 from core.baker_recipes import subscriber_user
+from core.models import User
 
 
 @pytest.mark.django_db
@@ -25,3 +28,10 @@ def test_club_queryset_having_board_member():
 
     club_ids = Club.objects.having_board_member(user).values_list("id", flat=True)
     assert set(club_ids) == {clubs[1].id, clubs[2].id}
+
+
+@pytest.mark.django_db
+def test_club_list(client: Client):
+    client.force_login(baker.make(User))
+    res = client.get(reverse("club:club_list"))
+    assert res.status_code == 200

club/tests/test_club_controller.py

@@ -59,6 +59,14 @@ class TestClubSearch(TestCase):
         ids = {d["id"] for d in response.json()["results"]}
         assert ids == {c.id for c in [self.clubs[0], self.clubs[1], self.clubs[3]]}
 
+    def test_club_search_profile(self):
+        self.client.force_login(self.user)
+        url = reverse("api:search_club_profile")
+        response = self.client.get(url, {"search": "AE"})
+        assert response.status_code == 200
+        ids = {d["id"] for d in response.json()["results"]}
+        assert ids == {c.id for c in [self.clubs[0], self.clubs[1], self.clubs[3]]}
+
 
 @pytest.mark.django_db
 class TestFetchClub:

club/views.py

@@ -42,7 +42,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import DetailView, ListView, View
+from django.views.generic import DetailView, TemplateView, View
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
@@ -180,15 +180,10 @@ class ClubTabsMixin(TabedViewMixin):
         return tab_list
 
 
-class ClubListView(ListView):
+class ClubListView(TemplateView):
     """List the Clubs."""
 
-    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/views.py

@@ -244,8 +244,9 @@ class NewsListView(TemplateView):
             .filter(
                 date_of_birth__month=localdate().month,
                 date_of_birth__day=localdate().day,
-                role__in=["STUDENT", "FORMER STUDENT"],
+                is_viewable=True,
             )
+            .filter(role__in=["STUDENT", "FORMER STUDENT"])
             .order_by("-date_of_birth"),
             key=lambda u: u.date_of_birth.year,
         )

core/admin.py

@@ -63,7 +63,6 @@ class UserAdmin(admin.ModelAdmin):
         "scrub_pict",
         "user_permissions",
         "groups",
-        "whitelisted_users",
     )
     inlines = (UserBanInline,)
     search_fields = ["first_name", "last_name", "username"]

core/migrations/0049_user_whitelisted_users.py

@@ -1,34 +0,0 @@
-# Generated by Django 5.2.12 on 2026-03-14 08:39
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0048_alter_user_options")]
-
-    operations = [
-        migrations.AddField(
-            model_name="user",
-            name="whitelisted_users",
-            field=models.ManyToManyField(
-                blank=True,
-                help_text=(
-                    "Even if this profile is hidden, "
-                    "the users in this list will still be able to see it."
-                ),
-                related_name="visible_by_whitelist",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="whitelisted users",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="preferences",
-            name="show_my_stats",
-            field=models.BooleanField(
-                default=False,
-                help_text="Allow subscribers to access your AE account stats.",
-                verbose_name="show your stats to others",
-            ),
-        ),
-    ]

core/models.py

@@ -131,7 +131,7 @@ class UserQuerySet(models.QuerySet):
         if user.has_perm("core.view_hidden_user"):
             return self
         if user.has_perm("core.view_user"):
-            return self.filter(Q(is_viewable=True) | Q(whitelisted_users=user))
+            return self.filter(is_viewable=True)
         if user.is_anonymous:
             return self.none()
         return self.filter(id=user.id)
@@ -279,16 +279,6 @@ class User(AbstractUser):
         ),
         default=True,
     )
-    whitelisted_users = models.ManyToManyField(
-        "User",
-        related_name="visible_by_whitelist",
-        verbose_name=_("whitelisted users"),
-        help_text=_(
-            "Even if this profile is hidden, "
-            "the users in this list will still be able to see it."
-        ),
-        blank=True,
-    )
     godfathers = models.ManyToManyField("User", related_name="godchildren", blank=True)
 
     objects = CustomUserManager()
@@ -528,7 +518,7 @@ class User(AbstractUser):
         self.username = user_name
         return user_name
 
-    def is_owner(self, obj: models.Model):
+    def is_owner(self, obj):
         """Determine if the object is owned by the user."""
         if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
             return True
@@ -536,7 +526,7 @@ class User(AbstractUser):
             return True
         return self.is_root
 
-    def can_edit(self, obj: models.Model):
+    def can_edit(self, obj):
         """Determine if the object can be edited by the user."""
         if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
             return True
@@ -550,9 +540,11 @@ class User(AbstractUser):
                 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
         return self.is_owner(obj)
 
-    def can_view(self, obj: models.Model):
+    def can_view(self, obj):
         """Determine if the object can be viewed by the user."""
         if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
             return True
@@ -571,35 +563,14 @@ class User(AbstractUser):
                 return True
         return self.can_edit(obj)
 
-    def can_be_edited_by(self, user: User):
-        return user == self or user.is_root or user.is_board_member
+    def can_be_edited_by(self, user):
+        return user.is_root or user.is_board_member
 
     def can_be_viewed_by(self, user: User) -> bool:
-        """Check if the given user can be viewed by this user.
-
-        Given users A and B. A can be viewed by B if :
-
-        - A and B are the same user
-        - or B has the permission to view hidden users
-        - or B can view users in general and A didn't hide its profile
-        - or B is in A's whitelist.
-        """
-
-        def is_in_whitelist(u: User):
-            if (
-                hasattr(self, "_prefetched_objects_cache")
-                and "whitelisted_users" in self._prefetched_objects_cache
-            ):
-                return u in self.whitelisted_users.all()
-            return self.whitelisted_users.contains(u)
-
         return (
             user.id == self.id
             or user.has_perm("core.view_hidden_user")
-            or (
-                user.has_perm("core.view_user")
-                and (self.is_viewable or is_in_whitelist(user))
-            )
+            or (user.has_perm("core.view_user") and self.is_viewable)
         )
 
     def get_mini_item(self):
@@ -779,11 +750,7 @@ class Preferences(models.Model):
         User, related_name="_preferences", on_delete=models.CASCADE
     )
     receive_weekmail = models.BooleanField(_("receive the Weekmail"), default=False)
-    show_my_stats = models.BooleanField(
-        _("show your stats to others"),
-        help_text=_("Allow subscribers to access your AE account stats."),
-        default=False,
-    )
+    show_my_stats = models.BooleanField(_("show your stats to others"), default=False)
     notify_on_click = models.BooleanField(
         _("get a notification for every click"), default=False
     )

core/static/core/forms.scss

@@ -157,7 +157,6 @@ form {
     margin-bottom: .25rem;
     font-size: 80%;
     display: block;
-    max-width: calc(100% - calc(var(--nf-input-size) * 2))
   }
 
   fieldset {

core/static/user/user_edit.scss

@@ -5,6 +5,17 @@
 }
 
 .profile {
+  &-visible {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 5px;
+    padding-top: 10px;
+    input[type="checkbox"]+label {
+      max-width: unset;
+    }
+  }
+
   &-pictures {
     box-sizing: border-box;
     display: flex;

core/static/user/user_preferences.scss

@@ -19,6 +19,28 @@
       }
     }
   }
+
+  &-cards,
+  &-trombi {
+    >p {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      text-align: justify;
+      gap: 5px;
+      margin: 0;
+
+      >input,
+      >select {
+        min-width: 300px;
+      }
+    }
+  }
+
+  &-submit-btn {
+    margin-top: 10px !important;
+    max-width: 100px;
+  }
 }
 
 .justify {

core/templates/core/base/navbar.jinja

@@ -5,9 +5,8 @@
     <details name="navbar" class="menu">
       <summary class="head">{% trans %}Associations & Clubs{% endtrans %}</summary>
       <ul class="content">
-        <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
-        <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
-        <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
+        <li><a href="{{ url("core:page", page_name="ae") }}">{% trans %}AE{% endtrans %}</a></li>
+        <li><a href="{{ url("club:club_list") }}">{% trans %}AE's clubs{% endtrans %}</a></li>
       </ul>
     </details>
     <details name="navbar" class="menu">

core/templates/core/base/notifications.jinja

@@ -1,11 +1,14 @@
 <div id="quick-notifications"
      x-data="{
              messages: [
-             {%- for message in messages -%}
-               {%- if not message.extra_tags -%}
-                 { tag: '{{ message.tags }}', text: '{{ message }}' },
-               {%- endif -%}
-             {%- endfor -%}
+             {% if messages %}
+               {% for message in messages %}
+                 {
+                 tag: '{{ message.tags }}',
+                 text: '{{ message }}',
+                 },
+               {% endfor %}
+             {% endif %}
              ]
              }"
      @quick-notification-add="(e) => messages.push(e?.detail)"

core/templates/core/fragment/user_visibility.jinja

@@ -1,33 +0,0 @@
-<form
-  hx-post="{{ url("core:user_visibility_fragment", user_id=form.instance.id) }}"
-  hx-disabled-elt="find input[type='submit']"
-  hx-swap="outerHTML" x-data="{ isViewable: {{ form.is_viewable.value()|tojson }} }"
->
-  {% for message in messages %}
-    {% if message.extra_tags=="visibility" %}
-      <div class="alert alert-success">
-        {{ message }}
-      </div>
-    {% endif %}
-  {% endfor %}
-  {% csrf_token %}
-  {{ form.non_field_errors() }}
-  <fieldset class="form-group">
-    {{ form.is_viewable|add_attr("x-model=isViewable") }}
-    {{ form.is_viewable.label_tag() }}
-    <span class="helptext">{{ form.is_viewable.help_text }}</span>
-    {{ form.is_viewable.errors }}
-  </fieldset>
-  <fieldset class="form-group" x-show="!isViewable">
-    {{ form.whitelisted_users.as_field_group() }}
-  </fieldset>
-  <fieldset class="form-group" x-show="isViewable">
-    {{ form.show_my_stats }}
-    {{ form.show_my_stats.label_tag() }}
-    <span class="helptext">
-      {{ form.show_my_stats.help_text }}
-    </span>
-    {{ form.show_my_stats.errors }}
-  </fieldset>
-  <input type="submit" class="btn btn-blue" value="{% trans %}Save{% endtrans %}">
-</form>

core/templates/core/user_edit.jinja

@@ -147,7 +147,18 @@
       {%- endfor -%}
     </div>
 
+    {# Checkboxes #}
+    <div class="profile-visible">
+      <div class="row">
+        {{ form.is_viewable }}
+        {{ form.is_viewable.label_tag() }}
+      </div>
+      <span class="helptext">
+        {{ form.is_viewable.help_text }}
+      </span>
+    </div>
     <div class="final-actions">
+
       {%- if form.instance == user -%}
         <p>
           <a href="{{ url('core:password_change') }}">{%- trans -%}Change my password{%- endtrans -%}</a>
@@ -159,6 +170,7 @@
           </a>
         </p>
       {%- endif -%}
+
       <p>
         <input type="submit" value="{%- trans -%}Update{%- endtrans -%}" />
       </p>

core/templates/core/user_preferences.jinja

@@ -1,14 +1,7 @@
 {% extends "core/base.jinja" %}
 
-{%- block additional_js -%}
-  <script type="module" src="{{ static("bundled/core/components/ajax-select-index.ts") }}"></script>
-{%- endblock -%}
-
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ static('user/user_preferences.scss') }}">
-  {# importing ajax-select-index is necessary for it to be applied after HTMX reload #}
-  <link rel="stylesheet" href="{{ static("bundled/core/components/ajax-select-index.css") }}">
-  <link rel="stylesheet" href="{{ static("core/components/ajax-select.scss") }}">
 {%- endblock -%}
 
 {% block title %}
@@ -18,22 +11,30 @@
 {% block content %}
   <div class="main">
     <h2>{% trans %}Preferences{% endtrans %}</h2>
-    <br />
-    <h3>{% trans %}Notifications{% endtrans %}</h3>
-    <form action="" method="post" enctype="multipart/form-data">
+    <h3>{% trans %}General{% endtrans %}</h3>
+    <form class="form form-general" action="" method="post" enctype="multipart/form-data">
       {% csrf_token %}
-      <div class="form form-general">
-        {{ form.as_p() }}
-      </div>
-      <input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" />
+      {{ form.as_p() }}
+      <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
     </form>
 
-    <br />
-    <h3>{% trans %}Visibility{% endtrans %}</h3>
+    <h3>{% trans %}Trombi{% endtrans %}</h3>
+
+    {% if trombi_form %}
+      <form class="form form-trombi" action="{{ url('trombi:user_tools') }}" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ trombi_form.as_p() }}
+        <input class="form-submit-btn" type="submit" value="{% trans %}Save{% endtrans %}" />
+      </form>
+
+    {% else %}
+      <p>{% trans trombi=profile.trombi_user.trombi %}You already choose to be in that Trombi: {{ trombi }}.{% endtrans %}
+        <br />
+        <a href="{{ url('trombi:user_tools') }}">{% trans %}Go to my Trombi tools{% endtrans %}</a>
+      </p>
+    {% endif %}
 
-    {{ user_visibility_fragment }}
 
-    <br />
     {% if student_card_fragment %}
       <h3>{% trans %}Student card{% endtrans %}</h3>
       {{ student_card_fragment }}
@@ -42,21 +43,5 @@
           add a student card yourself, you'll need a NFC reader. We store the UID of the card which is 14 characters long.{% endtrans %}
       </p>
     {% endif %}
-
-    <br />
-    <h3>{% trans %}Trombi{% endtrans %}</h3>
-
-    {% if trombi_form %}
-      <form action="{{ url('trombi:user_tools') }}" method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        {{ trombi_form.as_p() }}
-        <input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" />
-      </form>
-    {% else %}
-      <p>{% trans trombi=profile.trombi_user.trombi %}You already choose to be in that Trombi: {{ trombi }}.{% endtrans %}
-        <br />
-        <a href="{{ url('trombi:user_tools') }}">{% trans %}Go to my Trombi tools{% endtrans %}</a>
-      </p>
-    {% endif %}
   </div>
 {% endblock %}

core/tests/test_user.py

@@ -399,12 +399,13 @@ class TestUserQuerySetViewableBy:
         return [
             baker.make(User),
             subscriber_user.make(),
-            *subscriber_user.make(is_viewable=False, _quantity=2),
+            subscriber_user.make(is_viewable=False),
         ]
 
     def test_admin_user(self, users: list[User]):
         user = baker.make(
-            User, user_permissions=[Permission.objects.get(codename="view_hidden_user")]
+            User,
+            user_permissions=[Permission.objects.get(codename="view_hidden_user")],
         )
         viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)
         assert set(viewable) == set(users)
@@ -417,12 +418,6 @@ class TestUserQuerySetViewableBy:
         viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)
         assert set(viewable) == {users[0], users[1]}
 
-    def test_whitelist(self, users: list[User]):
-        user = subscriber_user.make()
-        users[3].whitelisted_users.add(user)
-        viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)
-        assert set(viewable) == {users[0], users[1], users[3]}
-
     @pytest.mark.parametrize("user_factory", [lambda: baker.make(User), AnonymousUser])
     def test_not_subscriber(self, users: list[User], user_factory):
         user = user_factory()

core/urls.py

@@ -69,6 +69,7 @@ from core.views import (
     UserCreationView,
     UserGodfathersTreeView,
     UserGodfathersView,
+    UserListView,
     UserMeRedirect,
     UserMiniView,
     UserPreferencesView,
@@ -77,7 +78,6 @@ from core.views import (
     UserUpdateGroupView,
     UserUpdateProfileView,
     UserView,
-    UserVisibilityFormFragment,
     delete_user_godfather,
     logout,
     notification,
@@ -136,11 +136,7 @@ urlpatterns = [
         "group/<int:group_id>/detail/", GroupTemplateView.as_view(), name="group_detail"
     ),
     # User views
-    path(
-        "fragment/user/<int:user_id>/",
-        UserVisibilityFormFragment.as_view(),
-        name="user_visibility_fragment",
-    ),
+    path("user/", UserListView.as_view(), name="user_list"),
     path(
         "user/me/<path:remaining_path>/",
         UserMeRedirect.as_view(),

core/views/forms.py

@@ -48,13 +48,12 @@ from phonenumber_field.widgets import RegionalPhoneNumberWidget
 from PIL import Image
 
 from antispam.forms import AntiSpamEmailField
-from core.models import Gift, Group, Page, PageRev, Preferences, SithFile, User
+from core.models import Gift, Group, Page, PageRev, SithFile, User
 from core.utils import resize_image
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
     AutoCompleteSelectGroup,
     AutoCompleteSelectMultipleGroup,
-    AutoCompleteSelectMultipleUser,
     AutoCompleteSelectUser,
 )
 from core.views.widgets.markdown import MarkdownInput
@@ -180,6 +179,7 @@ class UserProfileForm(forms.ModelForm):
             "school",
             "promo",
             "forum_signature",
+            "is_viewable",
         ]
         widgets = {
             "date_of_birth": SelectDate,
@@ -264,38 +264,6 @@ class UserProfileForm(forms.ModelForm):
         self._post_clean()
 
 
-class UserVisibilityForm(forms.ModelForm):
-    class Meta:
-        model = User
-        fields = ["is_viewable", "whitelisted_users"]
-        widgets = {
-            "is_viewable": forms.CheckboxInput(attrs={"class": "switch"}),
-            "whitelisted_users": AutoCompleteSelectMultipleUser,
-        }
-
-    __preferences_fields = forms.fields_for_model(
-        Preferences,
-        ["show_my_stats"],
-        widgets={"show_my_stats": forms.CheckboxInput(attrs={"class": "switch"})},
-    )
-    show_my_stats = __preferences_fields["show_my_stats"]
-
-    def __init__(
-        self, *args, initial: dict | None = None, instance: User | None = None, **kwargs
-    ):
-        if instance:
-            initial = initial or {}
-            initial["show_my_stats"] = instance.preferences.show_my_stats
-        super().__init__(*args, initial=initial, instance=instance, **kwargs)
-
-    def save(self, commit=True) -> User:  # noqa: FBT002
-        instance = super().save(commit=commit)
-        if commit:
-            instance.preferences.show_my_stats = self.cleaned_data["show_my_stats"]
-            instance.preferences.save()
-        return instance
-
-
 class UserGroupsForm(forms.ModelForm):
     error_css_class = "error"
     required_css_class = "required"

core/views/user.py

@@ -28,12 +28,10 @@ from datetime import timedelta
 from operator import itemgetter
 from smtplib import SMTPException
 
-from django.contrib import messages
 from django.contrib.auth import login, views
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import PasswordChangeForm, SetPasswordForm
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
-from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import PermissionDenied
 from django.db.models import DateField, F, QuerySet, Sum
 from django.db.models.functions import Trunc
@@ -50,6 +48,7 @@ from django.views.generic import (
     CreateView,
     DeleteView,
     DetailView,
+    ListView,
     RedirectView,
     TemplateView,
 )
@@ -66,9 +65,8 @@ from core.views.forms import (
     UserGodfathersForm,
     UserGroupsForm,
     UserProfileForm,
-    UserVisibilityForm,
 )
-from core.views.mixins import FragmentMixin, TabedViewMixin, UseFragmentsMixin
+from core.views.mixins import TabedViewMixin, UseFragmentsMixin
 from counter.models import Refilling, Selling
 from eboutic.models import Invoice
 from trombi.views import UserTrombiForm
@@ -250,14 +248,15 @@ class UserTabsMixin(TabedViewMixin):
                     "name": _("Groups"),
                 }
             )
-        if (
+        can_view_account = (
             hasattr(user, "customer")
             and user.customer
             and (
                 user == self.request.user
                 or self.request.user.has_perm("counter.view_customer")
             )
-        ):
+        )
+        if can_view_account or user.preferences.show_my_stats:
             tab_list.append(
                 {
                     "url": reverse("core:user_stats", kwargs={"user_id": user.id}),
@@ -265,6 +264,7 @@ class UserTabsMixin(TabedViewMixin):
                     "name": _("Stats"),
                 }
             )
+        if can_view_account:
             tab_list.append(
                 {
                     "url": reverse("core:user_account", kwargs={"user_id": user.id}),
@@ -351,7 +351,7 @@ class UserGodfathersTreeView(UserTabsMixin, CanViewMixin, DetailView):
         return kwargs
 
 
-class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
+class UserStatsView(UserTabsMixin, UserPassesTestMixin, DetailView):
     """Display a user's stats."""
 
     model = User
@@ -359,15 +359,20 @@ class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
     context_object_name = "profile"
     template_name = "core/user_stats.jinja"
     current_tab = "stats"
-    queryset = User.objects.exclude(customer=None).select_related("customer")
+    queryset = User.objects.exclude(customer=None).select_related(
+        "customer", "_preferences"
+    )
 
-    def dispatch(self, request, *arg, **kwargs):
-        profile = self.get_object()
-        if not (
-            profile == request.user or request.user.has_perm("counter.view_customer")
-        ):
-            raise PermissionDenied
-        return super().dispatch(request, *arg, **kwargs)
+    def test_func(self):
+        profile: User = self.get_object()
+        return (
+            profile == self.request.user
+            or self.request.user.has_perm("counter.view_customer")
+            or (
+                self.request.user.can_view(profile)
+                and profile.preferences.show_my_stats
+            )
+        )
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
@@ -406,6 +411,13 @@ class UserMiniView(CanViewMixin, DetailView):
     template_name = "core/user_mini.jinja"
 
 
+class UserListView(ListView, CanEditPropMixin):
+    """Displays the user list."""
+
+    model = User
+    template_name = "core/user_list.jinja"
+
+
 # FIXME: the edit_once fields aren't displayed to the user (as expected).
 #  However, if the user re-add them manually in the form, they are saved.
 class UserUpdateProfileView(UserTabsMixin, CanEditMixin, UpdateView):
@@ -463,30 +475,6 @@ class UserClubView(UserTabsMixin, CanViewMixin, DetailView):
     current_tab = "clubs"
 
 
-class UserVisibilityFormFragment(FragmentMixin, SuccessMessageMixin, UpdateView):
-    model = User
-    form_class = UserVisibilityForm
-    template_name = "core/fragment/user_visibility.jinja"
-    pk_url_kwarg = "user_id"
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"label_suffix": ""}
-
-    def form_valid(self, form):
-        response = super().form_valid(form)
-        messages.success(
-            self.request, _("Visibility parameters updated."), extra_tags="visibility"
-        )
-        return response
-
-    def render_fragment(self, request, **kwargs) -> SafeString:
-        self.object = kwargs.get("user")
-        return super().render_fragment(request, **kwargs)
-
-    def get_success_url(self, **kwargs):
-        return self.request.path
-
-
 class UserPreferencesView(UserTabsMixin, UseFragmentsMixin, CanEditMixin, UpdateView):
     """Edit a user's preferences."""
 
@@ -500,10 +488,7 @@ class UserPreferencesView(UserTabsMixin, UseFragmentsMixin, CanEditMixin, Update
     current_tab = "prefs"
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {
-            "instance": self.object.preferences,
-            "label_suffix": "",
-        }
+        return super().get_form_kwargs() | {"instance": self.object.preferences}
 
     def get_success_url(self):
         return self.request.path
@@ -513,9 +498,6 @@ class UserPreferencesView(UserTabsMixin, UseFragmentsMixin, CanEditMixin, Update
         from counter.views.student_card import StudentCardFormFragment
 
         res = super().get_fragment_context_data()
-        res["user_visibility_fragment"] = UserVisibilityFormFragment.as_fragment()(
-            self.request, user=self.object
-        )
         if hasattr(self.object, "customer"):
             res["student_card_fragment"] = StudentCardFormFragment.as_fragment()(
                 self.request, customer=self.object.customer

election/templates/election/election_detail.jinja

@@ -146,7 +146,7 @@
                           <label for="{{ input_id }}">
                         {%- endif %}
                         <figure>
-                          {%- if user.can_view(candidature.user) %}
+                          {%- if user.is_viewable %}
                             {% if candidature.user.profile_pict %}
                               <img class="candidate__picture" src="{{ candidature.user.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}">
                             {% else %}

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-14 23:09+0100\n"
+"POT-Creation-Date: 2026-03-20 16:24+0100\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"
@@ -310,16 +310,36 @@ 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"
+msgid "Filters"
+msgstr "Filtres"
+
+#: club/templates/club/club_list.jinja
+msgid "Name"
+msgstr "Nom"
+
+#: club/templates/club/club_list.jinja
+msgid "Club state"
+msgstr "Etat du club"
+
+#: club/templates/club/club_list.jinja
+msgid "Active"
+msgstr "Actif"
+
+#: club/templates/club/club_list.jinja
+msgid "Inactive"
+msgstr "Inactif"
+
+#: club/templates/club/club_list.jinja
+msgid "All clubs"
+msgstr "Tous les clubs"
 
 #: club/templates/club/club_list.jinja core/templates/core/user_tools.jinja
 msgid "New club"
 msgstr "Nouveau club"
 
 #: club/templates/club/club_list.jinja
-msgid "There is no club in this website."
-msgstr "Il n'y a pas de club dans ce site web."
+msgid "inactive"
+msgstr "inactif"
 
 #: club/templates/club/club_members.jinja
 msgid "Club members"
@@ -551,9 +571,8 @@ msgstr ""
 #: com/templates/com/news_edit.jinja com/templates/com/poster_edit.jinja
 #: com/templates/com/screen_edit.jinja com/templates/com/weekmail.jinja
 #: core/templates/core/create.jinja core/templates/core/edit.jinja
-#: core/templates/core/file_edit.jinja
-#: core/templates/core/fragment/user_visibility.jinja
-#: core/templates/core/page/edit.jinja core/templates/core/page/prop.jinja
+#: core/templates/core/file_edit.jinja core/templates/core/page/edit.jinja
+#: core/templates/core/page/prop.jinja
 #: core/templates/core/user_godfathers.jinja
 #: core/templates/core/user_godfathers_tree.jinja
 #: core/templates/core/user_preferences.jinja
@@ -1548,17 +1567,6 @@ msgid ""
 msgstr ""
 "Si vous désactivez cette option, seuls les admins pourront voir votre profil."
 
-#: core/models.py
-msgid "whitelisted users"
-msgstr "utilisateurs whitelistés"
-
-#: core/models.py
-msgid ""
-"Even if this profile is hidden, the users in this list will still be able to see "
-"it."
-msgstr ""
-"Même si ce profil est caché, les utilisateurs sur cette liste pourront toujours le voir."
-
 #: core/models.py
 msgid "A user with that username already exists"
 msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
@@ -1615,10 +1623,6 @@ msgstr "recevoir le Weekmail"
 msgid "show your stats to others"
 msgstr "montrez vos statistiques aux autres"
 
-#: core/models.py
-msgid "Allow subscribers to access your AE account stats."
-msgstr "Autoriser les cotisants à accéder aux statistiques de votre compte AE"
-
 #: core/models.py
 msgid "get a notification for every click"
 msgstr "avoir une notification pour chaque click"
@@ -1876,10 +1880,6 @@ msgstr "L'AE"
 msgid "AE's clubs"
 msgstr "Les clubs de L'AE"
 
-#: core/templates/core/base/navbar.jinja
-msgid "Others UTBM's Associations"
-msgstr "Les autres associations de l'UTBM"
-
 #: core/templates/core/base/navbar.jinja
 msgid "Big event"
 msgstr "Grandes Activités"
@@ -2628,12 +2628,21 @@ msgid "Preferences"
 msgstr "Préférences"
 
 #: core/templates/core/user_preferences.jinja
-msgid "Notifications"
-msgstr "Notifications"
+msgid "General"
+msgstr "Général"
+
+#: core/templates/core/user_preferences.jinja trombi/views.py
+msgid "Trombi"
+msgstr "Trombi"
 
 #: core/templates/core/user_preferences.jinja
-msgid "Visibility"
-msgstr "Visibilité"
+#, python-format
+msgid "You already choose to be in that Trombi: %(trombi)s."
+msgstr "Vous avez déjà choisi ce Trombi: %(trombi)s."
+
+#: core/templates/core/user_preferences.jinja
+msgid "Go to my Trombi tools"
+msgstr "Allez à mes outils de Trombi"
 
 #: core/templates/core/user_preferences.jinja
 #: counter/templates/counter/counter_click.jinja
@@ -2652,19 +2661,6 @@ msgstr ""
 "aurez besoin d'un lecteur NFC. Nous enregistrons l'UID de la carte qui fait "
 "14 caractères de long."
 
-#: core/templates/core/user_preferences.jinja trombi/views.py
-msgid "Trombi"
-msgstr "Trombi"
-
-#: core/templates/core/user_preferences.jinja
-#, python-format
-msgid "You already choose to be in that Trombi: %(trombi)s."
-msgstr "Vous avez déjà choisi ce Trombi: %(trombi)s."
-
-#: core/templates/core/user_preferences.jinja
-msgid "Go to my Trombi tools"
-msgstr "Allez à mes outils de Trombi"
-
 #: core/templates/core/user_stats.jinja
 #, python-format
 msgid "%(user_name)s's stats"
@@ -2945,10 +2941,6 @@ msgstr "Photos"
 msgid "Account"
 msgstr "Compte"
 
-#: core/views/user.py
-msgid "Visibility parameters updated."
-msgstr "Paramètres de visibilité mis à jour."
-
 #: counter/apps.py counter/models.py
 msgid "counter"
 msgstr "comptoir"

sas/models.py

@@ -270,11 +270,7 @@ class PeoplePictureRelationQuerySet(models.QuerySet):
         if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
             return self
         if user.was_subscribed:
-            return self.filter(
-                Q(user_id=user.id)
-                | Q(user__is_viewable=True)
-                | Q(user__whitelisted_users=user)
-            )
+            return self.filter(Q(user_id=user.id) | Q(user__is_viewable=True))
         return self.filter(user_id=user.id)
 
 

sith/settings.py

@@ -355,7 +355,6 @@ SITH_TWITTER = "@ae_utbm"
 # AE configuration
 SITH_MAIN_CLUB_ID = env.int("SITH_MAIN_CLUB_ID", default=1)
 SITH_PDF_CLUB_ID = env.int("SITH_PDF_CLUB_ID", default=2)
-SITH_LAUNDERETTE_CLUB_ID = env.int("SITH_LAUNDERETTE_CLUB_ID", default=84)
 
 # Main root for club pages
 SITH_CLUB_ROOT_PAGE = "clubs"
@@ -483,13 +482,6 @@ SITH_LOG_OPERATION_TYPE = [
 
 SITH_PEDAGOGY_UTBM_API = "https://extranet1.utbm.fr/gpedago/api/guide"
 
-SITH_ECOCUP_CONS = env.int("SITH_ECOCUP_CONS", default=1151)
-
-SITH_ECOCUP_DECO = env.int("SITH_ECOCUP_DECO", default=1152)
-
-# The limit is the maximum difference between cons and deco possible for a customer
-SITH_ECOCUP_LIMIT = 3
-
 # Defines pagination for cash summary
 SITH_COUNTER_CASH_SUMMARY_LENGTH = 50
 
@@ -512,7 +504,6 @@ SITH_PRODUCT_SUBSCRIPTION_ONE_SEMESTER = env.int(
 SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = env.int(
     "SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS", default=2
 )
-SITH_PRODUCTTYPE_SUBSCRIPTION = env.int("SITH_PRODUCTTYPE_SUBSCRIPTION", default=2)
 
 # Number of weeks before the end of a subscription when the subscriber can resubscribe
 SITH_SUBSCRIPTION_END = 10