Upload New File

Update models.py
2025-04-21 14:22:30 +00:00 · 2025-04-14 19:29:37 +02:00 · 2025-04-14 19:20:32 +02:00 · 2025-04-14 19:17:44 +02:00 · 2025-04-13 23:12:05 +02:00 · 2025-04-13 22:59:04 +02:00
8 changed files with 10 additions and 26 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/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@ -20,11 +20,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
      </form>
    </div>
    <!-- MODAL TO CROP THE IMAGE -->
-    <div class="modal fade" id="modalCrop">
+    <div class="modal fade" id="modalCrop" data-backdrop="static">
      <div class="modal-dialog">
        <div class="modal-content">
-          <div class="modal-body">
-            <img src="" id="modal-image" style="max-width: 100%;">
+            <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
+              <div class="modal-body" style="width: 100%; height: 100%; padding: 0">
+                <img src="" id="modal-image" style="display: block; max-width: 100%;">
+              </div>
            </div>
          <div class="modal-footer">
            <div class="btn-group pull-left" role="group">
--- 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/apps/treasury/migrations/0010_alter_invoice_bde.py
+++ b/apps/treasury/migrations/0010_alter_invoice_bde.py
@ -1,18 +0,0 @@
-# Generated by Django 4.2.20 on 2025-04-14 20:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0009_alter_sogecredit_transactions'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='bde',
-            field=models.CharField(choices=[('Diolistos', 'Diol[list]os'), ('RavePartlist', 'RavePart[list]'), ('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Diolistos', max_length=32, verbose_name='BDE'),
-        ),
-    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -29,7 +29,7 @@ class Invoice(models.Model):
        max_length=32,
        default='Diolistos',
        choices=(
-            ('Diolistos', 'Diol[list]os'),
+            ('Diolistos', 'Dio[list]os')
            ('RavePartlist', 'RavePart[list]'),
            ('SecretStorlist', 'SecretStor[list]'),
            ('TotalistSpies', 'Tota[list]Spies'),
--- a/apps/treasury/static/img/Diolistos.png
+++ b/apps/treasury/static/img/Diolistos.png
--- a/apps/treasury/static/img/Diolistos_bg.jpg
+++ b/apps/treasury/static/img/Diolistos_bg.jpg
--- 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
ehouarn	235b071ee6	Upload New File	2025-04-14 19:29:37 +02:00
ehouarn	9a67bb5e8f	Upload New File	2025-04-14 19:20:32 +02:00
ehouarn	fbd301dc58	Update models.py	2025-04-14 19:17:44 +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
alexismdr	b7a660ee40	bootstrap: fix minor issues with profile picture cropping * Add required [1] "display: block;" style property to img element * Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want. * Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping. [1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example [2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes [3] https://getbootstrap.com/docs/4.0/components/modal/#options See merge request bde/nk20!301	2025-04-04 01:14:46 +02:00
Alexis Mercier des Rochettes	93aed87265	bootstrap: fix minor issues with profile picture cropping * Add required [1] "display: block;" style property to img element * Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want. * Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping. [1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example [2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes [3] https://getbootstrap.com/docs/4.0/components/modal/#options Signed-off-by: Alexis Mercier des Rochettes <apernouille@gmail.com>	2025-03-24 17:36:30 +01:00