1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-17 03:57:42 +01:00

Merge branch 'main' into oauth2

This commit is contained in:
quark
2025-11-13 15:53:39 +01:00
16 changed files with 329 additions and 17 deletions

View File

@@ -927,7 +927,7 @@
"note",
"transactiontemplate"
],
"query": "{\"destination\": [\"club\", \"note\"]}",
"query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, {\"category__name\": \"Clubs\"}]",
"type": "view",
"mask": 2,
"field": "",
@@ -943,7 +943,7 @@
"note",
"transactiontemplate"
],
"query": "{\"destination\": [\"club\", \"note\"]}",
"query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, {\"category__name\": \"Clubs\"}]",
"type": "add",
"mask": 3,
"field": "",
@@ -959,7 +959,7 @@
"note",
"transactiontemplate"
],
"query": "{\"destination\": [\"club\", \"note\"]}",
"query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, {\"category__name\": \"Clubs\"}]",
"type": "change",
"mask": 3,
"field": "",
@@ -3484,7 +3484,23 @@
"mask": 1,
"permanent": false,
"description": "Voir la bouffe servie"
}
}
},
{
"model": "permission.permission",
"pk": 223,
"fields": {
"model": [
"note",
"templatecategory"
],
"query": "{\"name\": \"Clubs\"}",
"type": "view",
"mask": 2,
"field": "",
"permanent": false,
"description": "Voir la catégorie de bouton Clubs"
}
},
{
"model": "permission.permission",
@@ -4896,7 +4912,6 @@
19,
20,
21,
27,
59,
60,
61,
@@ -4907,6 +4922,7 @@
182,
184,
185,
223,
239,
240,
241
@@ -5271,6 +5287,12 @@
176,
177,
197,
211,
212,
213,
214,
215,
216,
311,
319
]