ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/beta' into beta

This commit is contained in:
Yohann D'ANELLO 2020-09-08 10:11:44 +02:00
parent 0741c8ad2b 428de69d93
commit fe937405a6
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
apps/permission/fixtures/initial.json
View File

@ -1103,7 +1103,7 @@
"treasury",
"sogecredit"
],
"query": "{\"credit_transaction\": null}",
"query": "{}",
"type": "add",
"mask": 1,
"field": "",
@ -2647,6 +2647,38 @@
"description": "Changer l'image de la note de son club"
}
},
{
"model": "permission.permission",
"pk": 170,
"fields": {
"model": [
"note",
"alias"
],
"query": "{\"note__is_active\": true}",
"type": "add",
"mask": 1,
"field": "",
"permanent": false,
"description": "Ajouter n'importe quel alias à une note non bloquée"
}
},
{
"model": "permission.permission",
"pk": 171,
"fields": {
"model": [
"note",
"alias"
],
"query": "{\"note__is_active\": true}",
"type": "delete",
"mask": 3,
"field": "",
"permanent": false,
"description": "Supprimer n'importe quel alias à une note non bloquée"
}
},
{
"model": "permission.role",
"pk": 1,
@ -2850,7 +2882,9 @@
150,
151,
163,
164
164,
170,
171
]
}
},
@ -3024,7 +3058,9 @@
166,
167,
168,
169
169,
170,
171
]
}
},
@ -3050,10 +3086,13 @@
29,
30,
31,
70,
143,
166,
167,
168
168,
170,
171
]
}
},