Merge branch 'options_order' into 'main'

Options order See merge request bde/nk20!306
Update forms.py
2025-07-07 15:58:31 +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 · 2025-04-13 19:56:20 +02:00
6 changed files with 11 additions and 10 deletions
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@ -201,8 +201,7 @@ class Entry(models.Model):
    def save(self, *args, **kwargs):
        qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
        if qs.exists():
-            raise ValidationError(_("Already entered on ")
-                                  + _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
+            raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))

        if self.guest:
            self.note = self.guest.inviter
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@ -55,7 +55,7 @@ class GuestTable(tables.Table):

    def render_entry(self, record):
        if record.has_entry:
-            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(record.entry.time))))
+            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
        return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
                         '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))

--- 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,12 +20,14 @@ 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>
+            <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">
              <button type="button" class="btn btn-default" id="js-zoom-in">
--- 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
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