Merge branch 'Add_some_permissions' into 'main'

Draft: Add some permissions See merge request bde/nk20!296
Merge branch 'notekfet_wrapped' into 'main'
2025-10-29 14:59:59 +01:00 · 2025-03-17 00:12:57 +01:00 · 2025-03-14 00:44:57 +01:00 · 2025-03-14 00:31:25 +01:00 · 2025-03-14 00:11:04 +01:00 · 2025-03-13 23:56:10 +01:00
199 changed files with 7854 additions and 4913 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,21 +7,6 @@ stages:
 variables:
  GIT_SUBMODULE_STRATEGY: recursive

-# Debian Bullseye
-py39-django42:
-  stage: test
-  image: debian:bullseye
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py39-django42
-
 # Ubuntu 22.04
 py310-django42:
  stage: test
@@ -54,8 +39,6 @@ py311-django42:
        python3-bs4 python3-setuptools tox texlive-xetex
  script: tox -e py311-django42

-
-
 linters:
  stage: quality-assurance
  image: debian:bookworm
--- a/apps/activity/init.py
+++ b/apps/activity/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'activity.apps.ActivityConfig'
--- a/apps/activity/admin.py
+++ b/apps/activity/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/activity/api/serializers.py
+++ b/apps/activity/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.utils.translation import gettext_lazy as _
--- a/apps/activity/api/urls.py
+++ b/apps/activity/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet, OpenerViewSet
--- a/apps/activity/api/views.py
+++ b/apps/activity/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.filters import RegexSafeSearchFilter
--- a/apps/activity/apps.py
+++ b/apps/activity/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import os
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.utils import timezone
--- a/apps/activity/tests/test_activities.py
+++ b/apps/activity/tests/test_activities.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/activity/urls.py
+++ b/apps/activity/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from hashlib import md5
@@ -265,12 +265,11 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
        # Keep only users that have a note
        note_qs = note_qs.filter(note__noteuser__isnull=False)

-        # Keep only members
+        # Keep only valid members
        note_qs = note_qs.filter(
            note__noteuser__user__memberships__club=activity.attendees_club,
            note__noteuser__user__memberships__date_start__lte=timezone.now(),
-            note__noteuser__user__memberships__date_end__gte=timezone.now(),
-        )
+            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')

        # Filter with permission backend
        note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))
@@ -330,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
        context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
        context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk

-        activities_open = Activity.objects.filter(open=True).filter(
+        activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
            PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
        context["activities_open"] = [a for a in activities_open
                                      if PermissionBackend.check_perm(self.request,
--- a/apps/api/init.py
+++ b/apps/api/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'api.apps.APIConfig'
--- a/apps/api/apps.py
+++ b/apps/api/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/api/serializers.py
+++ b/apps/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import json
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
@@ -47,6 +47,10 @@ if "wei" in settings.INSTALLED_APPS:
    from wei.api.urls import register_wei_urls
    register_wei_urls(router, 'wei')

+if "wrapped" in settings.INSTALLED_APPS:
+    from wrapped.api.urls import register_wrapped_urls
+    register_wrapped_urls(router, 'wrapped')
+
 app_name = 'api'

 # Wire up our API using automatic URL routing.
--- a/apps/api/views.py
+++ b/apps/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/apps/api/viewsets.py
+++ b/apps/api/viewsets.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import re
--- a/apps/food/admin.py
+++ b/apps/food/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/food/api/serializers.py
+++ b/apps/food/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/food/api/urls.py
+++ b/apps/food/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet
--- a/apps/food/api/views.py
+++ b/apps/food/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.viewsets import ReadProtectedModelViewSet
--- a/apps/food/apps.py
+++ b/apps/food/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/food/forms.py
+++ b/apps/food/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from random import shuffle
--- a/apps/food/models.py
+++ b/apps/food/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/food/tables.py
+++ b/apps/food/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.db import transaction
--- a/apps/logs/init.py
+++ b/apps/logs/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'logs.apps.LogsConfig'
--- a/apps/logs/api/serializers.py
+++ b/apps/logs/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/logs/api/urls.py
+++ b/apps/logs/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ChangelogViewSet
--- a/apps/logs/api/views.py
+++ b/apps/logs/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/logs/apps.py
+++ b/apps/logs/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/logs/models.py
+++ b/apps/logs/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/logs/signals.py
+++ b/apps/logs/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.contenttypes.models import ContentType
--- a/apps/member/init.py
+++ b/apps/member/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'member.apps.MemberConfig'
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/member/api/serializers.py
+++ b/apps/member/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/member/api/urls.py
+++ b/apps/member/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ProfileViewSet, ClubViewSet, MembershipViewSet
--- a/apps/member/api/views.py
+++ b/apps/member/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/member/apps.py
+++ b/apps/member/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/member/auth.py
+++ b/apps/member/auth.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from cas_server.auth import DjangoAuthUser  # pragma: no cover
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import io
@@ -44,6 +44,7 @@ class ProfileForm(forms.ModelForm):
    """
    A form for the extras field provided by the :model:`member.Profile` model.
    """
+    # Remove widget=forms.HiddenInput() if you want to use report frequency.
    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))

    last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
@@ -76,7 +77,8 @@ class ProfileForm(forms.ModelForm):
    class Meta:
        model = Profile
        fields = '__all__'
-        exclude = ('user', 'email_confirmed', 'registration_valid', )
+        # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list.
+        exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', )


 class ImageForm(forms.Form):
--- a/apps/member/hashers.py
+++ b/apps/member/hashers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import hashlib
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import datetime
--- a/apps/member/signals.py
+++ b/apps/member/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/member/tables.py
+++ b/apps/member/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import date
@@ -42,12 +42,12 @@ class UserTable(tables.Table):
    """
    alias = tables.Column()

-    section = tables.Column(accessor='profile__section')
+    section = tables.Column(accessor='profile__section', orderable=False)

    # Override the column to let replace the URL
    email = tables.EmailColumn(linkify=lambda record: "mailto:{}".format(record.email))

-    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"))
+    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"), orderable=False)

    def render_email(self, record, value):
        # Replace the email by a dash if the user can't see the profile detail
--- a/apps/member/templates/member/club_members.html
+++ b/apps/member/templates/member/club_members.html
@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
        {{ title }}
    </h3>
    <div class="card-body">
-        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note…">
+        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note...">
        <div class="form-check">
            <label class="form-check-label" for="only_active">
                <input type="checkbox" class="checkboxinput form-check-input" id="only_active"
--- a/apps/member/templatetags/memberinfo.py
+++ b/apps/member/templatetags/memberinfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import date
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta, date
@@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from django import forms

 from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
    CustomAuthenticationForm, MembershipRolesForm
@@ -72,11 +73,24 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
        form.fields['email'].required = True
        form.fields['email'].help_text = _("This address must be valid.")

-        if PermissionBackend.check_perm(self.request, "member.change_profile", context['user_object'].profile):
-            context['profile_form'] = self.profile_form(instance=context['user_object'].profile,
-                                                        data=self.request.POST if self.request.POST else None)
-            if not self.object.profile.report_frequency:
-                del context['profile_form'].fields["last_report"]
+        profile_form = self.profile_form(instance=context['user_object'].profile,
+                                         data=self.request.POST if self.request.POST else None)
+
+        if not self.object.profile.report_frequency:
+            del profile_form.fields["last_report"]
+
+        fields_to_check = list(profile_form.fields.keys())
+        fields_modifiable = False
+
+        # Delete the fields for which the user does not have the permission to modify
+        for field_name in fields_to_check:
+            if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile):
+                profile_form.fields[field_name].widget = forms.HiddenInput()
+            else:
+                fields_modifiable = True
+
+        if fields_modifiable:
+            context['profile_form'] = profile_form

        return context

--- a/apps/note/init.py
+++ b/apps/note/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'note.apps.NoteConfig'
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import NotePolymorphicViewSet, AliasViewSet, ConsumerViewSet, \
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/note/apps.py
+++ b/apps/note/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from datetime import datetime

--- a/apps/note/models/init.py
+++ b/apps/note/models/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, Trust
--- a/apps/note/models/notes.py
+++ b/apps/note/models/notes.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import unicodedata
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.core.exceptions import ValidationError
--- a/apps/note/signals.py
+++ b/apps/note/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.utils import timezone
--- a/apps/note/static/note/js/consos.js
+++ b/apps/note/static/note/js/consos.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+// Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 // SPDX-License-Identifier: GPL-3.0-or-later

 // When a transaction is performed, lock the interface to prevent spam clicks.
@@ -245,7 +245,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
          invalidity_reason: 'Solde insuffisant',
          polymorphic_ctype: type,
          resourcetype: 'RecurrentTransaction',
-          source: source,
+          source: source.id,
          source_alias: source_alias,
          destination: dest,
          template: template
@@ -294,3 +294,10 @@ searchbar.addEventListener("keyup", function (e) {
  if (firstMatch && e.key === "Enter")
    firstMatch.click()
 });
+
+function createshiny() {
+  const list_btn = document.querySelectorAll('.btn-outline-dark')
+  const shiny_class = list_btn[Math.floor(Math.random() * list_btn.length)].classList
+  shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny')
+}
+createshiny()
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import html
@@ -260,11 +260,13 @@ class ButtonTable(tables.Table):
        text=_('edit'),
        accessor='pk',
        verbose_name=_("Edit"),
+        orderable=False,
    )

    hideshow = tables.Column(
        verbose_name=_("Hide/Show"),
        accessor="pk",
+        orderable=False,
        attrs={
            'td': {
                'class': 'col-sm-1',
@@ -276,7 +278,8 @@ class ButtonTable(tables.Table):
    delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE,
                                       extra_context={"delete_trans": _('delete')},
                                       attrs={'td': {'class': 'col-sm-1'}},
-                                       verbose_name=_("Delete"), )
+                                       verbose_name=_("Delete"),
+                                       orderable=False, )

    def render_amount(self, value):
        return pretty_money(value)
--- a/apps/note/templatetags/getenv.py
+++ b/apps/note/templatetags/getenv.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import template
--- a/apps/note/templatetags/pretty_money.py
+++ b/apps/note/templatetags/pretty_money.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import template
--- a/apps/note/tests/test_transactions.py
+++ b/apps/note/tests/test_transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.tests import TestAPI
--- a/apps/note/urls.py
+++ b/apps/note/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import json
--- a/apps/permission/init.py
+++ b/apps/permission/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'permission.apps.PermissionConfig'
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-lateré

 from django.contrib import admin
@@ -31,3 +31,4 @@ class RoleAdmin(admin.ModelAdmin):
    Admin customisation for Role
    """
    list_display = ('name', )
+    filter_horizontal = ('permissions',)
--- a/apps/permission/api/serializers.py
+++ b/apps/permission/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/permission/api/urls.py
+++ b/apps/permission/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import PermissionViewSet, RoleViewSet
--- a/apps/permission/api/views.py
+++ b/apps/permission/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/permission/apps.py
+++ b/apps/permission/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from datetime import date
+from datetime import date, timedelta

 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User
@@ -106,6 +106,7 @@ class PermissionBackend(ModelBackend):
                Q=Q,
                now=timezone.now(),
                today=date.today(),
+                week=timedelta(days=7),
            )
            yield permission

--- a/apps/permission/decorators.py
+++ b/apps/permission/decorators.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
 from functools import lru_cache
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import functools
@@ -135,18 +135,18 @@ class Permission(models.Model):

    # A json encoded Q object with the following grammar
    #  query -> [] | {}  (the empty query representing all objects)
-    #  query -> ["AND", query, …]            AND multiple queries
-    #         | ["OR", query, …]             OR multiple queries
+    #  query -> ["AND", query, ...]          AND multiple queries
+    #         | ["OR", query, ...]           OR multiple queries
    #         | ["NOT", query]               Opposite of query
-    #  query -> {key: value, …}              A list of fields and values of a Q object
+    #  query -> {key: value, ...}            A list of fields and values of a Q object
    #  key   -> string                       A field name
    #  value -> int | string | bool | null   Literal values
-    #         | [parameter, …]               A parameter. See compute_param for more details.
+    #         | [parameter, ...]             A parameter. See compute_param for more details.
    #         | {"F": oper}                  An F object
-    #  oper  -> [string, …]                  A parameter. See compute_param for more details.
-    #         | ["ADD", oper, …]             Sum multiple F objects or literal
+    #  oper  -> [string, ...]                A parameter. See compute_param for more details.
+    #         | ["ADD", oper, ...]           Sum multiple F objects or literal
    #         | ["SUB", oper, oper]          Substract two F objects or literal
-    #         | ["MUL", oper, …]             Multiply F objects or literals
+    #         | ["MUL", oper, ...]           Multiply F objects or literals
    #         | int | string | bool | null   Literal values
    #         | ["F", string]                A field
    #
--- a/apps/permission/permissions.py
+++ b/apps/permission/permissions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework.permissions import DjangoObjectPermissions
--- a/apps/permission/scopes.py
+++ b/apps/permission/scopes.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.core.exceptions import PermissionDenied
--- a/apps/permission/tables.py
+++ b/apps/permission/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/permission/templatetags/perms.py
+++ b/apps/permission/templatetags/perms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.contenttypes.models import ContentType
--- a/apps/permission/tests/test_oauth2.py
+++ b/apps/permission/tests/test_oauth2.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/permission/tests/test_permission_denied.py
+++ b/apps/permission/tests/test_permission_denied.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta, date
--- a/apps/permission/tests/test_permission_queries.py
+++ b/apps/permission/tests/test_permission_queries.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from datetime import date
+from datetime import date, timedelta
 from json.decoder import JSONDecodeError

 from django.contrib.auth.models import User
@@ -73,6 +73,7 @@ class PermissionQueryTestCase(TestCase):
                    Q=Q,
                    now=timezone.now(),
                    today=date.today(),
+                    week=timedelta(days=7),
                )
                instanced.update_query()
                query = instanced.query
--- a/apps/permission/tests/test_rights_page.py
+++ b/apps/permission/tests/test_rights_page.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/apps/permission/urls.py
+++ b/apps/permission/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from collections import OrderedDict
 from datetime import date
--- a/apps/registration/init.py
+++ b/apps/registration/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'registration.apps.RegistrationConfig'
--- a/apps/registration/apps.py
+++ b/apps/registration/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import forms
--- a/apps/registration/tables.py
+++ b/apps/registration/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/registration/tests/test_registration.py
+++ b/apps/registration/tests/test_registration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/apps/registration/tokens.py
+++ b/apps/registration/tokens.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Copied from https://gitlab.crans.org/bombar/codeflix/-/blob/master/codeflix/codeflix/tokens.py

--- a/apps/registration/urls.py
+++ b/apps/registration/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import forms
@@ -300,9 +300,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
 #            join_bde = True
 #            join_kfet = True

-        if not join_bde:
+        if not (join_bde or any(b for _, b in join_clubs)):
            # This software belongs to the BDE.
-            form.add_error('join_bde', _("You must join the BDE."))
+            form.add_error('join_bde', _("You must join a club."))
+            return super().form_invalid(form)
+
+        if join_kfet and not join_bde:
+            form.add_error('join_bde', _("You must also join the parent club BDE."))
            return super().form_invalid(form)

        # Calculate required registration fee
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
thomasl	3b7ae5b160	Merge branch 'Add_some_permissions' into 'main' Draft: Add some permissions See merge request bde/nk20!296	2025-03-17 00:12:57 +01:00
quark	cb61c511ce	Merge branch 'notekfet_wrapped' into 'main' Another tables and doc See merge request bde/nk20!299	2025-03-14 00:44:57 +01:00
quark	25bfa575ed	Another tables and doc	2025-03-14 00:31:25 +01:00
quark	e21d9fcfbe	Merge branch 'notekfet_wrapped' into 'main' Notekfet wrapped See merge request bde/nk20!298	2025-03-14 00:11:04 +01:00
quark	b293904525	Another tables and doc	2025-03-13 23:56:10 +01:00
quark	bd7e6b8ad4	add table, add some translation	2025-03-13 21:08:52 +01:00
quark	a208a4fa25	Merge branch 'bde_color' into 'main' Resize and compress image, add shiny button See merge request bde/nk20!297	2025-03-13 00:44:45 +01:00
quark	4799b2c52d	Resize and compress image, add shiny button	2025-03-12 23:42:37 +01:00
thomasl	562dcfb908	Update file initial.json	2025-03-11 19:34:56 +01:00
thomasl	12ef258ff0	Update file initial.json	2025-03-11 19:27:02 +01:00
thomasl	2ae32ee3b6	Update file initial.json	2025-03-11 19:26:49 +01:00
thomasl	ec1bd45481	Update file initial.json	2025-03-11 19:14:09 +01:00
quark	370a9a069e	Merge branch 'bde_color' into 'main' Rave Part[list] colors See merge request bde/nk20!295	2025-03-11 10:31:02 +01:00
quark	7f0a3784e9	Rave Part[list] colors	2025-03-11 10:15:11 +01:00
quark	36f4adf2e7	Merge branch 'update_copyright' into 'main' update copyright See merge request bde/nk20!292	2025-03-09 18:35:44 +01:00
quark	ae7d5d5489	update copyright	2025-03-09 18:14:58 +01:00
quark	434097aba4	Merge branch 'nerf_pc_kfet' into 'main' Nerf pc kfet See merge request bde/nk20!291	2025-03-09 17:58:25 +01:00
quark	a0ebf8658d	nerf invalidate perm	2025-03-09 17:34:14 +01:00
quark	423454ba5d	nerf PC Kfet perms	2025-03-09 14:37:35 +01:00
quark	3ccb31639c	Merge branch 'perm_gc_anti_vss' into 'main' improve permissions for GC anti-VSS See merge request bde/nk20!290	2025-03-09 13:28:55 +01:00
quark	5fb12a1388	improve permissions for GC anti-VSS	2025-03-09 13:11:46 +01:00
thomasl	fe029893b0	Merge branch 'permissions_fo_parent_clubs' into 'main' Permissions fo parent clubs See merge request bde/nk20!289	2025-03-08 22:29:07 +01:00
thomasl	767e98c2a3	Update file initial.json	2025-03-08 22:05:22 +01:00
thomasl	1bdad76fe9	Update file initial.json	2025-03-08 22:00:46 +01:00
thomasl	0196db7fff	Update file initial.json	2025-03-08 21:54:28 +01:00
thomasl	1f53ad4407	Update file initial.json	2025-03-08 21:47:21 +01:00
thomasl	018f6e3f13	Update file initial.json	2025-03-08 21:37:53 +01:00
thomasl	9752a030d9	Update file initial.json	2025-03-08 21:30:25 +01:00
thomasl	b27bdb090d	Update file initial.json	2025-03-08 21:30:16 +01:00
thomasl	55a0fbb6cb	Update file initial.json	2025-03-08 21:15:56 +01:00
thomasl	c356534309	Update file initial.json	2025-03-08 20:25:33 +01:00
thomasl	51315a0555	Update file initial.json	2025-03-08 20:25:16 +01:00
thomasl	e5f9fe2cf5	Update file initial.json	2025-03-08 20:00:20 +01:00
quark	c630a3fbd5	Merge branch 'change_template' into 'main' Change template See merge request bde/nk20!288	2025-03-07 19:25:27 +01:00
quark	79b8ebeca4	Merge branch 'main' into change_template	2025-03-07 19:09:17 +01:00
quark	dc14ba0101	Suppression article TVA	2025-03-07 18:42:41 +01:00
quark	6028bfeb56	Merge branch 'notekfet_wrapped' into 'main' Notekfet wrapped See merge request bde/nk20!287	2025-03-05 22:03:51 +01:00
quark	bd9773a8af	change icon	2025-03-05 13:28:55 +01:00
quark	cdeb76d9f8	Merge branch 'main' into notekfet_wrapped	2025-03-04 19:08:32 +01:00
quark	ac4574200d	Modify font	2025-03-04 18:45:22 +01:00
quark	b17d31e8ee	translation	2025-02-25 14:11:53 +01:00
quark	30d27459dd	modify tox.ini to use complex script for make wrapped (bypass C901 in linters)	2025-02-25 01:52:13 +01:00
quark	333f7aa284	update font and minor change	2025-02-24 18:37:18 +01:00
quark	587314e03c	linters	2025-02-24 16:10:58 +01:00
thomasl	9f888a5281	Merge branch 'patch_openers_(forgot_something)' into 'main' Patch openers (forgot something) See merge request bde/nk20!286	2025-02-18 21:44:21 +01:00
thomasl	88b1a25ca0	Update file initial.json	2025-02-18 21:26:55 +01:00
thomasl	8cb50f58f2	Merge branch 'Respo_jam_permission' into 'main' Respo jam permission See merge request bde/nk20!285	2025-02-17 14:48:21 +01:00
thomasl	041a8f20a9	A permission was missing	2025-02-17 14:28:00 +01:00
thomasl	b1ffb28532	Update file initial.json	2025-02-17 14:19:00 +01:00
thomasl	6225fb51f1	Add some permissions	2025-02-17 14:10:21 +01:00
thomasl	1dd74e8024	Merge branch 'openers' into 'main' Patch Openers See merge request bde/nk20!284	2025-02-17 02:13:47 +01:00
thomasl	1af9f5f23c	some updates	2025-02-17 02:12:44 +01:00
thomasl	83d5a7ceff	Update file initial.json	2025-02-17 01:58:13 +01:00
thomasl	a7cba0a4a3	Update file initial.json	2025-02-16 23:33:18 +01:00
thomasl	ccd9a66ab9	Update file initial.json	2025-02-16 23:24:39 +01:00
thomasl	c7a92fa4b2	Update file initial.json	2025-02-16 20:49:11 +01:00
quark	5f1b698d58	Finish script, finish view, make some progress on template	2025-02-16 18:10:53 +01:00
thomasl	0a5368d23f	Merge branch 'respo_comm_permissionsV2' into 'main' Respo comm permissions v2 See merge request bde/nk20!283	2025-02-14 18:38:39 +01:00
thomasl	26b351a51c	Add another permission for model guest in activity	2025-02-14 18:14:35 +01:00
thomasl	1836677c47	Update file initial.json	2025-02-13 22:30:36 +01:00
thomasl	e7a98c86f0	Tried something with permissions	2025-02-13 21:51:26 +01:00
thomasl	eb5044490b	Delete a useless permission	2025-02-13 21:37:58 +01:00
thomasl	983d7ec052	linters	2025-02-13 21:35:29 +01:00
thomasl	dc56deaf85	Final modifications	2025-02-13 21:17:57 +01:00
quark	19d1ecfc66	continue the script and few change to model	2025-02-13 02:39:33 +01:00
quark	694f54e1c4	Merge branch 'fix_activity_view' into 'main' fix issue with activity entry view See merge request bde/nk20!282	2025-02-12 10:18:33 +01:00
quark	b0c3eee699	start to write generate_wrapped script	2025-02-12 00:00:23 +01:00
quark	cd942779ca	Wrapped apps	2025-02-11 18:19:24 +01:00
quark	0d0fdef363	fix issue with activity entry view	2025-02-09 17:58:38 +01:00
quark	7ed544b3ac	fix issues with activity entry view	2025-02-09 17:50:15 +01:00
thomasl	821efbf78b	Merge branch 'Automation_mailing_lists' into 'main' Automation mailing lists See merge request bde/nk20!280	2025-02-02 14:53:04 +01:00
thomasl	a209e0d366	Update file forms.py	2025-02-02 14:30:53 +01:00
thomasl	ef485e0628	Update file forms.py	2025-02-02 14:06:22 +01:00
thomasl	1481aa0635	Update file forms.py	2025-02-02 14:05:05 +01:00
thomasl	867bf9fd25	Update file forms.py	2025-02-02 13:33:41 +01:00
thomasl	47fda0ea36	Update file forms.py	2025-02-02 13:17:19 +01:00
thomasl	623290827a	Update file forms.py	2025-01-27 16:34:45 +01:00
thomasl	a87ce625f3	Update file note.cron	2025-01-25 13:55:21 +01:00
thomasl	3559787fa7	Merge branch 'New_permission' into 'main' New permission See merge request bde/nk20!278	2025-01-18 15:41:15 +01:00
thomasl	bd6ed27ae5	Update 2 files - /apps/permission/fixtures/initial.json - /apps/permission/admin.py	2025-01-18 15:11:57 +01:00
thomasl	43dc676747	Update file initial.json	2025-01-18 12:57:42 +01:00
thomasl	caaeab6b0b	Update file initial.json	2025-01-17 19:39:26 +01:00
thomasl	54ba786884	Update file initial.json	2025-01-17 19:03:59 +01:00
thomasl	80e109114f	Update file initial.json	2025-01-17 18:23:28 +01:00
mcngnt	787005e60d	Merge branch 'finito_sda' into 'main' finitio le message sda See merge request bde/nk20!279	2025-01-06 00:11:01 +01:00
mcngnt	414e103686	finitio le message sda	2025-01-05 23:17:01 +01:00
thomasl	942d887c2e	Update file initial.json	2024-12-23 18:31:11 +01:00
thomasl	a63c34fe37	Update file initial.json	2024-12-22 21:38:17 +01:00
thomasl	2be6133458	Update file initial.json	2024-12-22 20:42:20 +01:00
quark	7975fe47a6	Merge branch 'sda' into 'main' Donation goal la note kfet x les SdA See merge request bde/nk20!277	2024-10-10 23:44:22 +02:00
quark	476fbceeea	Donation goal la note kfet x les SdA	2024-10-10 01:48:23 +02:00
mcngnt	8fbaa0bdc8	Merge branch 'linters' into 'main' fix linters for WEI 2024 survey See merge request bde/nk20!274	2024-10-03 16:51:04 +02:00
thomasl	a0de63effd	Merge branch 'beta' into 'main' Correction translation of sport events ml See merge request bde/nk20!276	2024-09-18 13:52:33 +02:00
korenstin	09fb1d227e	Correction translation of sport events ml	2024-09-18 08:54:04 +02:00
thomasl	2e27d4f05c	Merge branch 'non-BDE-members-permission-fix' into 'main' Added some necessary rights See merge request bde/nk20!275	2024-09-17 17:24:30 +02:00
Nicolas Margulies	5d16dc4e7d	Added some necessary rights	2024-09-17 17:13:47 +02:00
bleizi	3c34033bf5	fix linters for WEI 2024 survey	2024-09-12 13:41:04 +02:00
mcngnt	131f508433	Merge branch 'survey_wei_2024' into 'main' update hardcoded See merge request bde/nk20!273	2024-09-12 12:03:10 +02:00
quark	9162319734	Merge branch 'quark-main-patch-05186' into 'main' Update views.py (don't display forced blocked note, it's just temporary patch,... See merge request bde/nk20!272	2024-09-09 21:02:19 +02:00
quark	5d2a8e9b79	Update views.py (don't display forced blocked note, it's just temporary patch, we need to block these note in models too)	2024-09-09 19:05:53 +02:00
bleizi	33c94d0720	Merge branch 'non-BDE-members' into 'main' Allow non-BDE members to use the note See merge request bde/nk20!268	2024-09-05 23:15:04 +02:00
bleizi	5040e8e8ea	Merge branch 'continuous-intergration' into 'main' continuous-intergration See merge request bde/nk20!271	2024-09-05 20:54:40 +02:00
Nicolas Margulies	c5697c4cb4	don't hide the transfer tab	2024-09-05 20:54:23 +02:00
nicomarg	e188c5a153	Merge branch 'mail' into 'main' mail Closes #119 See merge request bde/nk20!270	2024-09-05 20:29:30 +02:00
bleizi	94e1fdc93a	add ubuntu 24.4 in tox.ini and remove debian bullseye in gitlab-ci	2024-09-05 20:19:46 +02:00
Nicolas Margulies	d1ef367bab	Permissions for child clubs, also changed spaces for tabs	2024-09-05 20:17:45 +02:00
bleizi	0fbb19c5fd	limite mail sending to 10 per minute and purge fail mail log	2024-09-05 19:48:54 +02:00
mcngnt	21cbf2b21a	Merge branch 'survey_wei_2024' into 'main' Survey wei 2024 See merge request bde/nk20!269	2024-08-29 23:10:57 +02:00
nicomarg	361de9f8b4	more bug fixing	2024-08-29 21:06:34 +02:00
nicomarg	e2426bd6a6	Bugfix	2024-08-29 20:03:43 +02:00
nicomarg	7fea619a9f	add permission to make transfers with members of your club	2024-08-29 20:02:06 +02:00
nicomarg	7b5eefcc0a	Update 2 files - /apps/registration/views.py - /apps/permission/fixtures/initial.json	2024-08-29 19:23:26 +02:00
mcngnt	e4aa16986f	Merge branch 'survey_wei_2024' into 'main' linting See merge request bde/nk20!267	2024-08-29 19:12:23 +02:00
mcngnt	dd675b3676	Merge branch 'survey_wei_2024' into 'main' Survey wei 2024 See merge request bde/nk20!266	2024-08-29 14:45:28 +02:00
korenstin	a5df98224f	Merge branch 'migration-django-4-2' into 'main' Migration django 4 2 See merge request bde/nk20!265	2024-08-29 10:49:44 +02:00
korenstin	2cb9ac8735	replace "…" -> "..." (#130 ) and disable sorting on certain columns (#129 )	2024-08-29 10:19:06 +02:00
korenstin	35d4849a28	fix Oauth	2024-08-29 00:43:33 +02:00