Merge branch 'time-display' into 'main'

Fixed some non timezone-aware displays See merge request bde/nk20!303
Merge branch 'options_order' into 'main'
2025-04-21 14:22:30 +00:00 · 2025-04-15 17:28:12 +02:00 · 2025-04-13 23:12:05 +02:00 · 2025-04-13 22:59:04 +02:00 · 2025-04-13 22:32:49 +02:00 · 2025-04-13 20:17:44 +02:00
3 changed files with 3 additions and 3 deletions
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@ -23,7 +23,7 @@ from .models import Profile, Club, Membership
 class CustomAuthenticationForm(AuthenticationForm):
    permission_mask = forms.ModelChoiceField(
        label=_("Permission mask"),
-        queryset=PermissionMask.objects.order_by("rank"),
+        queryset=PermissionMask.objects.order_by("-rank"),
        empty_label=None,
    )

--- a/apps/note/templates/note/transaction_form.html
+++ b/apps/note/templates/note/transaction_form.html
@ -89,7 +89,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                </ul>
                <div class="card-body">
                    <select id="debit_type" class="form-control custom-select d-none">
-                        {% for special_type in special_types %}
+                        {% for special_type in special_types|slice:"::-1" %}
                            <option value="{{ special_type.id }}">{{ special_type.special_type }}</option>
                        {% endfor %}
                    </select>
--- a/note.cron
+++ b/note.cron
@ -27,5 +27,5 @@ MAILTO=notekfet2020@lists.crans.org
 # Vider les tokens Oauth2
 00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 # Envoyer la liste des abonnés à la NL BDA
- 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art
+ 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
Author	SHA1	Message	Date
nicomarg	0c5501a889	Merge branch 'time-display' into 'main' Fixed some non timezone-aware displays See merge request bde/nk20!303	2025-04-15 17:28:12 +02:00
ehouarn	8e2b24b2da	Merge branch 'options_order' into 'main' Options order See merge request bde/nk20!306	2025-04-13 23:12:05 +02:00
ehouarn	bd76c280ec	Update forms.py	2025-04-13 22:59:04 +02:00
ehouarn	ca0a95ba9e	Update transaction_form.html	2025-04-13 22:32:49 +02:00
alexismdr	614f76e699	Add BDA email as an option to fix NL updates Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron. [1] `3dd5f6e3e0` See merge request bde/nk20!305	2025-04-13 20:17:44 +02:00
alexismdr	a5815f0bc7	Add BDA email as an option to fix NL updates Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron. [1] `3dd5f6e3e0`	2025-04-13 19:56:20 +02:00