Merge branch 'qrcode' into 'main'

Draft: Qrcode See merge request bde/nk20!196
Merge branch 'Respo_jam_permission' into 'main'
2025-10-31 15:50:03 +01:00 · 2025-02-18 16:37:46 +01:00 · 2025-02-17 14:48:21 +01:00 · 2025-02-17 14:28:00 +01:00 · 2025-02-17 14:19:00 +01:00 · 2025-02-17 14:10:21 +01:00
2 changed files with 114 additions and 1 deletions
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -3896,6 +3896,118 @@
            "description": "Voir les personnes invitées aux événements organisés par son club"
        }
    },
+    {
+        "model": "permission.permission",
+        "pk": 248,
+        "fields": {
+            "model": [
+                "auth",
+                "user"
+            ],
+            "query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
+            "type": "view",
+            "mask": 3,
+            "field": "",
+            "permanent": false,
+            "description": "Voir n'importe quel⋅le utilisateur⋅rice pour les ouvreur⋅ses"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 249,
+        "fields": {
+            "model": [
+                "note",
+                "note"
+            ],
+            "query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir toutes les notes lorsque utilisateur⋅rice est ouvreur⋅ses"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 250,
+        "fields": {
+            "model": [
+                "activity",
+                "guest"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "delete",
+            "mask": 1,
+            "field": "",
+            "permanent": false,
+            "description": "Supprimer des personnes invitées aux événements organisés par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 251,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les ouvreur⋅ses des activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 252,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Ajouter des ouvreur⋅ses aux activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 253,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "delete",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Supprimer des ouvreur⋅ses aux activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 254,
+        "fields": {
+            "model": [
+                "activity",
+                "activity"
+            ],
+            "query": "{\"organizer\": [\"club\"]}",
+            "type": "change",
+            "mask": 2,
+            "field": "opener",
+            "permanent": false,
+            "description": "Voir le tableau des ouvreur⋅ses pour les activités organisées par son club"
+        }
+    },
    {
        "model": "permission.role",
        "pk": 1,
--- a/note.cron
+++ b/note.cron
@@ -27,4 +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  8     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -v 0
+ 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art
+
Author	SHA1	Message	Date
Otthorn	82e533499b	Merge branch 'qrcode' into 'main' Draft: Qrcode See merge request bde/nk20!196	2025-02-18 16:37:46 +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