diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 8a7162c3..f504d8e1 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -208,7 +208,9 @@ class Transaction(PolymorphicModel): super().save(*args, **kwargs) # Save notes + self.source._force_save = True self.source.save() + self.destination._force_save = True self.destination.save() def delete(self, **kwargs): diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 2622ed1c..5a3001da 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -36,7 +36,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our User object" + "description": "Voir son compte utilisateur" } }, { @@ -52,7 +52,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our profile" + "description": "Voir son profil" } }, { @@ -68,7 +68,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our own note" + "description": "Vioir sa propre note d'utilisateur" } }, { @@ -84,7 +84,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our API token" + "description": "Voir son jeton d'authentification à l'API" } }, { @@ -100,7 +100,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our own transactions" + "description": "Voir ses propres transactions" } }, { @@ -116,7 +116,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View aliases of clubs and members of Kfet club" + "description": "Voir les aliases des notes des clubs et des adhérents du club Kfet" } }, { @@ -132,7 +132,7 @@ "mask": 1, "field": "last_login", "permanent": true, - "description": "Change myself's last login" + "description": "Modifier sa propre date de dernière connexion" } }, { @@ -148,7 +148,7 @@ "mask": 1, "field": "username", "permanent": true, - "description": "Change myself's username" + "description": "Changer son propre pseudo" } }, { @@ -164,7 +164,7 @@ "mask": 1, "field": "first_name", "permanent": true, - "description": "Change myself's first name" + "description": "Changer son propre prénom" } }, { @@ -180,7 +180,7 @@ "mask": 1, "field": "last_name", "permanent": true, - "description": "Change myself's last name" + "description": "Changer son propre nom de famille" } }, { @@ -196,7 +196,7 @@ "mask": 1, "field": "email", "permanent": true, - "description": "Change myself's email" + "description": "Changer sa propre adresse e-mail" } }, { @@ -212,7 +212,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "Delete API Token" + "description": "Supprimer son jeton d'authentification à l'API" } }, { @@ -228,7 +228,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "Create API Token" + "description": "Créer un jeton d'authentification à l'API" } }, { @@ -244,7 +244,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Remove alias" + "description": "Supprimer un alias à sa note" } }, { @@ -260,7 +260,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add alias" + "description": "Ajouter un alias à sa note" } }, { @@ -276,7 +276,7 @@ "mask": 1, "field": "display_image", "permanent": false, - "description": "Change myself's display image" + "description": "Changer l'image de sa note" } }, { @@ -292,23 +292,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Transfer from myself's note" - } - }, - { - "model": "permission.permission", - "pk": 18, - "fields": { - "model": [ - "note", - "note" - ], - "query": "{}", - "type": "change", - "mask": 1, - "field": "balance", - "permanent": false, - "description": "Update a note balance with a transaction" + "description": "Transférer de l'argent depuis sa propre note en restant positif" } }, { @@ -324,7 +308,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View notes of club members" + "description": "Voir les notes des membres du club" } }, { @@ -340,7 +324,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Create transactions with a club" + "description": "Créer une transaction de ou vers la note d'un club" } }, { @@ -356,7 +340,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Create transactions from buttons with a club" + "description": "Créer une transaction en appuyant sur un bouton lié à un club" } }, { @@ -372,7 +356,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View club infos" + "description": "Voir les informations d'un club" } }, { @@ -388,7 +372,7 @@ "mask": 1, "field": "valid", "permanent": false, - "description": "Update validation status of a transaction" + "description": "Mettre à jour le statut de validation d'une transaction" } }, { @@ -404,7 +388,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View all transactions" + "description": "Voir toutes les transactions" } }, { @@ -420,7 +404,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Display credit/debit interface" + "description": "Afficher l'interface crédit/retrait" } }, { @@ -436,7 +420,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Create credit/debit transaction" + "description": "Créer un crédit ou un retrait quelconque" } }, { @@ -452,7 +436,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View button categories" + "description": "Voir toutes les catégories de boutons" } }, { @@ -468,7 +452,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Change button category" + "description": "Changer une catégorie de boutons" } }, { @@ -484,7 +468,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Add button category" + "description": "Créer une catégorie de boutons" } }, { @@ -500,7 +484,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View buttons" + "description": "Voir tous les boutons" } }, { @@ -516,7 +500,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Add buttons" + "description": "Ajouter un bouton" } }, { @@ -532,7 +516,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Update buttons" + "description": "Modifier un bouton" } }, { @@ -548,7 +532,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Create any transaction" + "description": "Créer n'importe quelle transaction" } }, { @@ -564,7 +548,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View valid activites" + "description": "Voir toutes les activités valides" } }, { @@ -580,7 +564,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Change our activities" + "description": "Modifier les activités non validées dont on est l'auteur" } }, { @@ -596,7 +580,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add activities" + "description": "Proposer des activités" } }, { @@ -612,7 +596,7 @@ "mask": 2, "field": "valid", "permanent": false, - "description": "Validate activities" + "description": "Valider des activités" } }, { @@ -628,7 +612,7 @@ "mask": 2, "field": "open", "permanent": false, - "description": "Open activities" + "description": "Ouvrir des activités" } }, { @@ -644,7 +628,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Invite people to activities" + "description": "Inviter des personnes à des activités" } }, { @@ -660,7 +644,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View invited people" + "description": "Voir les personnes qu'on a invitées" } }, { @@ -676,7 +660,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View all activities" + "description": "Voir toutes les activités" } }, { @@ -692,7 +676,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "View all invited people" + "description": "Voir toutes les personnes invitées" } }, { @@ -703,12 +687,12 @@ "activity", "entry" ], - "query": "{}", + "query": "{\"activity__open\": true}", "type": "add", "mask": 2, "field": "", "permanent": false, - "description": "Manage entries" + "description": "Gérer les entrées d'une activité ouverte" } }, { @@ -724,7 +708,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Add invitation transactions" + "description": "Créer une transaction d'invitation" } }, { @@ -740,7 +724,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View invitation transactions" + "description": "Voir toutes les transactions d'invitation" } }, { @@ -756,7 +740,7 @@ "mask": 2, "field": "valid", "permanent": false, - "description": "Validate invitation transactions" + "description": "Valider les transactions d'invitation" } }, { @@ -772,7 +756,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Update club" + "description": "Modifier un club" } }, { @@ -788,7 +772,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View our memberships" + "description": "Voir mes adhésions" } }, { @@ -804,7 +788,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View club's memberships" + "description": "Voir les adhérents du club" } }, { @@ -820,7 +804,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Add a membership to a club" + "description": "Ajouter un membre à un club" } }, { @@ -836,7 +820,7 @@ "mask": 3, "field": "roles", "permanent": false, - "description": "Update user roles" + "description": "Modifier les rôles d'un adhérent d'un club" } }, { @@ -852,7 +836,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Change own profile" + "description": "Modifier son profil" } }, { @@ -865,10 +849,10 @@ ], "query": "{}", "type": "change", - "mask": 2, + "mask": 3, "field": "", "permanent": false, - "description": "Change any profile" + "description": "Modifier n'importe quel profil" } }, { @@ -881,10 +865,10 @@ ], "query": "{}", "type": "change", - "mask": 2, + "mask": 3, "field": "", "permanent": false, - "description": "Change any user" + "description": "Modifier n'import quel utilisateur" } }, { @@ -900,7 +884,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add user" + "description": "Ajouter un utilisateur" } }, { @@ -916,7 +900,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add profile" + "description": "Ajouter un profil" } }, { @@ -929,10 +913,10 @@ ], "query": "{\"profile__registration_valid\": false}", "type": "delete", - "mask": 2, + "mask": 3, "field": "", "permanent": false, - "description": "Delete pre-registered user" + "description": "Supprimer une pré-inscription" } }, { @@ -945,10 +929,10 @@ ], "query": "{\"registration_valid\": false}", "type": "delete", - "mask": 2, + "mask": 3, "field": "", "permanent": false, - "description": "Delete pre-registered user profile" + "description": "Supprimer le profil d'une pré-inscription" } }, { @@ -964,7 +948,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "New club button" + "description": "Voir les boutons d'un club" } }, { @@ -977,10 +961,10 @@ ], "query": "{\"destination\": [\"club\", \"note\"]}", "type": "add", - "mask": 2, + "mask": 3, "field": "", "permanent": false, - "description": "Create club button" + "description": "Créer un bouton d'un club" } }, { @@ -996,7 +980,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Update club button" + "description": "Modifier le bouton d'un club" } }, { @@ -1012,7 +996,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View transactions of a club" + "description": "Voir les transactions d'un club" } }, { @@ -1028,7 +1012,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View invoices" + "description": "Voir les factures" } }, { @@ -1044,7 +1028,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Add invoice" + "description": "Ajouter une facture" } }, { @@ -1060,7 +1044,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Change invoice" + "description": "Modifier une facture" } }, { @@ -1076,7 +1060,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View products" + "description": "Voir les produits" } }, { @@ -1092,7 +1076,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Add products" + "description": "Ajouter des produits" } }, { @@ -1108,7 +1092,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Change product" + "description": "Modifier un produit" } }, { @@ -1124,7 +1108,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Delete product" + "description": "Supprimer un produit" } }, { @@ -1140,7 +1124,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit" + "description": "Ajouter un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale" } }, { @@ -1156,7 +1140,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View all Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credits" + "description": "Voir tous les crédits de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale" } }, { @@ -1172,7 +1156,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Update Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit" + "description": "Modifier un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale" } }, { @@ -1188,7 +1172,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Delete Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit" + "description": "Supprimer un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale" } }, { @@ -1204,7 +1188,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Create a WEI" + "description": "Créer un WEI" } }, { @@ -1220,7 +1204,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Update all WEI" + "description": "Modifier tous les WEI" } }, { @@ -1236,7 +1220,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Update this WEI" + "description": "Modifier ce WEI" } }, { @@ -1252,7 +1236,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View my WEI" + "description": "Voir mon WEI" } }, { @@ -1268,7 +1252,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View last WEI" + "description": "Voir le dernier WEI" } }, { @@ -1284,55 +1268,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View WEI Roles" - } - }, - { - "model": "permission.permission", - "pk": 80, - "fields": { - "model": [ - "wei", - "weirole" - ], - "query": "{}", - "type": "add", - "mask": 3, - "field": "", - "permanent": false, - "description": "Add WEI Role" - } - }, - { - "model": "permission.permission", - "pk": 81, - "fields": { - "model": [ - "wei", - "weirole" - ], - "query": "{}", - "type": "change", - "mask": 3, - "field": "", - "permanent": false, - "description": "Change WEI Role" - } - }, - { - "model": "permission.permission", - "pk": 82, - "fields": { - "model": [ - "wei", - "weirole" - ], - "query": "{}", - "type": "delete", - "mask": 3, - "field": "", - "permanent": false, - "description": "Delete WEI Role" + "description": "Voir les rôles pour le WEI" } }, { @@ -1348,7 +1284,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Register myself to the last WEI" + "description": "M'inscrire au dernier WEI" } }, { @@ -1364,7 +1300,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Register first year members to the last WEI" + "description": "Inscrire un 1A au WEI" } }, { @@ -1380,7 +1316,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Register anyone to this WEI" + "description": "Inscrire n'importe qui au WEI" } }, { @@ -1396,7 +1332,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Delete WEI registration" + "description": "Supprimer une inscription WEI" } }, { @@ -1412,7 +1348,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "View my own WEI registration" + "description": "Voir ma propre inscription WEI" } }, { @@ -1428,7 +1364,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View all WEI Registrations" + "description": "Voir toutes les inscriptions WEI" } }, { @@ -1444,7 +1380,7 @@ "mask": 1, "field": "soge_credit", "permanent": false, - "description": "Update the soge credit field of any WEI Registration" + "description": "Indiquer si une inscription WEI est payée par la Société générale" } }, { @@ -1460,7 +1396,7 @@ "mask": 1, "field": "soge_credit", "permanent": false, - "description": "Update the soge credit field of my own WEI Registration" + "description": "Indiquer si mon inscription WEI est payée par la Société générale tant qu'elle n'est pas validée" } }, { @@ -1476,7 +1412,7 @@ "mask": 1, "field": "caution_check", "permanent": false, - "description": "Update the caution check field of any WEI Registration" + "description": "Dire si un chèque de caution est donné pour une inscription WEI" } }, { @@ -1492,7 +1428,7 @@ "mask": 1, "field": "birth_date", "permanent": false, - "description": "Update the birth date of any WEI Registration" + "description": "Modifier la date de naissance d'une inscription WEI" } }, { @@ -1508,7 +1444,7 @@ "mask": 1, "field": "birth_date", "permanent": false, - "description": "Update the birth date of my own WEI Registration" + "description": "Modifier la date de naissance de ma propre inscription WEI" } }, { @@ -1524,7 +1460,7 @@ "mask": 1, "field": "gender", "permanent": false, - "description": "Update the gender of any WEI Registration" + "description": "Modifier le genre de toute inscription WEI" } }, { @@ -1540,7 +1476,7 @@ "mask": 1, "field": "gender", "permanent": false, - "description": "Update the gender of my own WEI Registration" + "description": "Modifier le genre de ma propre inscription WEI" } }, { @@ -1556,7 +1492,7 @@ "mask": 1, "field": "health_issues", "permanent": false, - "description": "Update the health issues of any WEI Registration" + "description": "Modifier les problèmes de santé de toutes les inscriptions WEI" } }, { @@ -1572,7 +1508,7 @@ "mask": 1, "field": "health_issues", "permanent": false, - "description": "Update the health issues of my own WEI Registration" + "description": "Modifier mes problèmes de santé de mon inscription WEI" } }, { @@ -1588,7 +1524,7 @@ "mask": 1, "field": "emergency_contact_name", "permanent": false, - "description": "Update the emergency contact name of any WEI Registration" + "description": "Modifier le nom du contact en cas d'urgence de toute inscription WEI" } }, { @@ -1604,7 +1540,7 @@ "mask": 1, "field": "emergency_contact_name", "permanent": false, - "description": "Update the emergency contact name of my own WEI Registration" + "description": "Modifier le nom du contact en cas d'urgence de mon inscription WEI" } }, { @@ -1620,7 +1556,7 @@ "mask": 1, "field": "emergency_contact_phone", "permanent": false, - "description": "Update the emergency contact phone of any WEI Registration" + "description": "Modifier le téléphone du contact en cas d'urgence de toute inscription WEI" } }, { @@ -1636,7 +1572,7 @@ "mask": 1, "field": "emergency_contact_phone", "permanent": false, - "description": "Update the emergency contact phone of my own WEI Registration" + "description": "Modifier le nom du contact en cas d'urgence de mon inscription WEI" } }, { @@ -1652,7 +1588,7 @@ "mask": 1, "field": "information_json", "permanent": false, - "description": "Update information of any WEI registration" + "description": "Modifier les informations (sondage 1A, ...) d'une inscription WEI" } }, { @@ -1668,7 +1604,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Add a bus for the current WEI" + "description": "Ajouter un bus au WEI" } }, { @@ -1684,7 +1620,7 @@ "mask": 3, "field": "name", "permanent": false, - "description": "Update the name of a bus for the last WEI" + "description": "Modifier le nom d'un bus d'un WEI" } }, { @@ -1700,7 +1636,7 @@ "mask": 3, "field": "description", "permanent": false, - "description": "Update the description of a bus for the last WEI" + "description": "Modifier la description d'un bus d'un WEI" } }, { @@ -1716,7 +1652,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Create a bus team for the last WEI" + "description": "Créer une équipe WEI" } }, { @@ -1732,7 +1668,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Update a bus team for the last WEI" + "description": "Modifier une équipe WEI" } }, { @@ -1748,7 +1684,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View buses of the last WEI" + "description": "Voir tous les bus WEI si on est en 2A+ ou que le WEI est terminé" } }, { @@ -1764,7 +1700,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View bus teams of the last WEI" + "description": "Voir toutes les équipes WEI si on est en 2A+ ou que le WEI est terminé" } }, { @@ -1780,7 +1716,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Create a WEI membership for the last WEI" + "description": "Créer une adhésion WEI pour le dernier WEI" } }, { @@ -1796,7 +1732,7 @@ "mask": 1, "field": "bus", "permanent": false, - "description": "Update the bus of a WEI membership" + "description": "Modifier le bus d'une adhésion WEI" } }, { @@ -1812,7 +1748,7 @@ "mask": 1, "field": "team", "permanent": false, - "description": "Update the team of a WEI membership" + "description": "Modifier l'équipe d'une adhésion WEI" } }, { @@ -1828,7 +1764,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View all WEI Memberships for the last WEI" + "description": "Voir toutes les adhésions au WEI" } }, { @@ -1839,12 +1775,12 @@ "wei", "weimembership" ], - "query": "[\"AND\", {\"user\": [\"user\"], \"club\": [\"club\"]}, [\"OR\", {\"registration__first_year\": false, \"club__weiclub__date_end__lte\": [\"today\"]}]]", + "query": "[\"AND\", {\"user\": [\"user\"], \"club\": [\"club\"]}, [\"OR\", {\"registration__first_year\": false}, {\"club__weiclub__date_end__lte\": [\"today\"]}]]", "type": "view", "mask": 1, "field": "", "permanent": true, - "description": "View my own WEI membership if I am an old member or if the WEI is past" + "description": "Voir mes adhésions WEI passées" } }, { @@ -1860,7 +1796,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View the members of the bus" + "description": "Voir les membres du bus" } }, { @@ -1876,7 +1812,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View the members of the team" + "description": "Voir les membres de l'équipe" } }, { @@ -1892,7 +1828,7 @@ "mask": 1, "field": "name", "permanent": false, - "description": "Update the name of my bus" + "description": "Modifier le nom du bus" } }, { @@ -1908,7 +1844,7 @@ "mask": 1, "field": "description", "permanent": false, - "description": "Update the description of my bus" + "description": "Modifier la description du bus" } }, { @@ -1924,7 +1860,7 @@ "mask": 1, "field": "", "permanent": false, - "description": "Add a team to my bus" + "description": "Ajouter une équipe à mon bus" } }, { @@ -1940,7 +1876,7 @@ "mask": 1, "field": "name", "permanent": false, - "description": "Update the name of a team of my bus" + "description": "Modifier le nom d'une équipe de mon bus" } }, { @@ -1956,7 +1892,7 @@ "mask": 1, "field": "color", "permanent": false, - "description": "Update the color of a team of my bus" + "description": "Modifier la couleur d'une équipe de mon bus" } }, { @@ -1972,7 +1908,7 @@ "mask": 1, "field": "description", "permanent": false, - "description": "Update the description of a team of my bus" + "description": "Modifier la description d'une équipe de mon bus" } }, { @@ -1988,7 +1924,7 @@ "mask": 1, "field": "name", "permanent": false, - "description": "Update the name of my team" + "description": "Modifier le nom de mon équipe" } }, { @@ -2004,7 +1940,7 @@ "mask": 1, "field": "color", "permanent": false, - "description": "Update the color of my team" + "description": "Modifier la couleur de mon équipe" } }, { @@ -2020,7 +1956,7 @@ "mask": 1, "field": "description", "permanent": false, - "description": "Update the description of my team" + "description": "Modifier la description de mon équipe" } }, { @@ -2036,7 +1972,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "View my past activities" + "description": "Voir mes activitées passées, même après la fin de l'adhésion BDE" } }, { @@ -2049,10 +1985,10 @@ ], "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": true}]]", "type": "change", - "mask": 1, + "mask": 2, "field": "valid", "permanent": false, - "description": "Update validation status of a club transaction if possible" + "description": "Modifier le statut de validation d'une transaction de club si c'est possible" } }, { @@ -2068,7 +2004,7 @@ "mask": 1, "field": "clothing_cut", "permanent": false, - "description": "Update the clothing cut field of any WEI Registration" + "description": "Modifier la coupe de vêtements d'une inscription WEI" } }, { @@ -2084,7 +2020,7 @@ "mask": 1, "field": "clothing_cut", "permanent": false, - "description": "Update the clothing cut field of my own WEI Registration" + "description": "Modifier ma coupe de vêtements de mon inscription WEI" } }, { @@ -2100,7 +2036,7 @@ "mask": 1, "field": "clothing_size", "permanent": false, - "description": "Update the clothing size field of any WEI Registration" + "description": "Modifier la taille de vêtements d'une inscription WEI" } }, { @@ -2116,7 +2052,7 @@ "mask": 1, "field": "clothing_size", "permanent": false, - "description": "Update the clothing size field of my own WEI Registration" + "description": "Modifier la taille de vêtements de mon inscription WEI" } }, { @@ -2132,7 +2068,7 @@ "mask": 2, "field": "", "permanent": false, - "description": "Create any recurrent transaction" + "description": "Créer une transaction depuis un bouton" } }, { @@ -2148,7 +2084,7 @@ "mask": 1, "field": "invalidity_reason", "permanent": false, - "description": "Update invalidity reason of a club transaction if possible" + "description": "Modifier la raison d'invalidité d'une transaction de club" } }, { @@ -2164,7 +2100,7 @@ "mask": 1, "field": "invalidity_reason", "permanent": false, - "description": "Update invalidity reason of a transaction" + "description": "Modifier la raison d'invalidité d'une transaction" } }, { @@ -2180,7 +2116,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View any user" + "description": "Voir n'importe quel utilisateur" } }, { @@ -2196,7 +2132,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View any profile" + "description": "Voir n'importe quel profil" } }, { @@ -2212,7 +2148,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View any club" + "description": "Voir n'importe quel club" } }, { @@ -2228,7 +2164,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Change any club" + "description": "Modifier n'importe quel club" } }, { @@ -2244,7 +2180,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Create any noteclub" + "description": "Créer une note de club" } }, { @@ -2260,7 +2196,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Create any club" + "description": "Créer un club" } }, { @@ -2276,7 +2212,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "View members of our club" + "description": "Voir les membres de mon club" } }, { @@ -2292,7 +2228,23 @@ "mask": 2, "field": "", "permanent": false, - "description": "View club note" + "description": "Voir la note de mon club" + } + }, + { + "model": "permission.permission", + "pk": 143, + "fields": { + "model": [ + "note", + "noteuser" + ], + "query": "{}", + "type": "add", + "mask": 1, + "field": "", + "permanent": false, + "description": "Créer une note d'utilisateur" } }, { @@ -2338,7 +2290,6 @@ 15, 16, 17, - 18, 78, 79, 83, @@ -2468,7 +2419,8 @@ 136, 137, 138, - 139 + 139, + 143 ] } }, @@ -2496,7 +2448,6 @@ 15, 16, 17, - 18, 19, 20, 21, @@ -2558,9 +2509,6 @@ 77, 78, 79, - 80, - 81, - 82, 83, 84, 85, @@ -2620,7 +2568,8 @@ 139, 140, 141, - 142 + 142, + 143 ] } }, @@ -2648,7 +2597,8 @@ 28, 29, 30, - 31 + 31, + 143 ] } }, @@ -2678,9 +2628,6 @@ "name": "GC WEI", "permissions": [ 76, - 80, - 81, - 82, 85, 86, 88, @@ -2713,6 +2660,7 @@ "for_club": null, "name": "Chef de bus", "permissions": [ + 84, 117, 118, 120, @@ -2729,6 +2677,7 @@ "for_club": null, "name": "Chef d'\u00e9quipe", "permissions": [ + 84, 116, 123, 124, @@ -2742,7 +2691,9 @@ "fields": { "for_club": null, "name": "\u00c9lectron libre", - "permissions": [] + "permissions": [ + 84 + ] } }, { @@ -2751,7 +2702,9 @@ "fields": { "for_club": null, "name": "\u00c9lectron libre (avec perm)", - "permissions": [] + "permissions": [ + 84 + ] } }, { @@ -2771,7 +2724,6 @@ "name": "Adhérent WEI", "permissions": [ 77, - 84, 87, 90, 93, diff --git a/apps/permission/models.py b/apps/permission/models.py index beace783..d2ac2195 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -124,10 +124,10 @@ class PermissionMask(models.Model): class Permission(models.Model): PERMISSION_TYPES = [ - ('add', 'add'), - ('view', 'view'), - ('change', 'change'), - ('delete', 'delete') + ('add', _('add')), + ('view', _('view')), + ('change', _('change')), + ('delete', _('delete')) ] model = models.ForeignKey( diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f7b8412f..6a8cb929 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-31 17:00+0200\n" +"POT-Creation-Date: 2020-07-31 22:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:151 apps/note/models/notes.py:188 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:261 apps/permission/models.py:323 +#: apps/note/models/transactions.py:263 apps/permission/models.py:332 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -71,14 +71,14 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:53 apps/note/models/transactions.py:81 -#: apps/permission/models.py:104 apps/permission/models.py:183 +#: apps/permission/models.py:113 apps/permission/models.py:192 #: apps/wei/models.py:71 apps/wei/models.py:128 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "" #: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:66 apps/permission/models.py:158 +#: apps/note/models/transactions.py:66 apps/permission/models.py:167 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" @@ -193,7 +193,7 @@ msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:107 #: apps/registration/forms.py:69 apps/treasury/forms.py:122 -#: templates/note/transaction_form.html:126 +#: templates/note/transaction_form.html:127 msgid "First name" msgstr "" @@ -241,7 +241,7 @@ msgstr "" msgid "IP Address" msgstr "" -#: apps/logs/models.py:35 apps/permission/models.py:128 +#: apps/logs/models.py:35 apps/permission/models.py:137 msgid "model" msgstr "" @@ -267,7 +267,7 @@ msgid "edit" msgstr "" #: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166 -#: apps/wei/tables.py:65 +#: apps/permission/models.py:130 apps/wei/tables.py:65 msgid "delete" msgstr "" @@ -324,7 +324,7 @@ msgid "Credit amount" msgstr "" #: apps/member/forms.py:112 apps/registration/forms.py:74 -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132 +#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133 msgid "Bank" msgstr "" @@ -533,7 +533,7 @@ msgstr "" msgid "fee" msgstr "" -#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787 +#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797 msgid "User is not a member of the parent club" msgstr "" @@ -613,7 +613,7 @@ msgstr "" msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:529 apps/wei/views.py:778 +#: apps/member/views.py:529 apps/wei/views.py:788 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -827,46 +827,46 @@ msgid "" "is not active." msgstr "" -#: apps/note/models/transactions.py:228 +#: apps/note/models/transactions.py:230 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 -#: templates/note/transaction_form.html:140 +#: templates/note/transaction_form.html:141 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:251 +#: apps/note/models/transactions.py:253 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:266 +#: apps/note/models/transactions.py:268 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:271 +#: apps/note/models/transactions.py:273 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:277 +#: apps/note/models/transactions.py:279 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:290 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310 +#: apps/note/models/transactions.py:307 apps/note/models/transactions.py:312 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:306 apps/treasury/models.py:227 +#: apps/note/models/transactions.py:308 apps/treasury/models.py:227 msgid "membership transactions" msgstr "" @@ -915,67 +915,79 @@ msgstr "" msgid "Consumptions" msgstr "" -#: apps/permission/models.py:83 +#: apps/permission/models.py:92 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:85 +#: apps/permission/models.py:94 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:98 +#: apps/permission/models.py:107 msgid "rank" msgstr "" -#: apps/permission/models.py:111 +#: apps/permission/models.py:120 msgid "permission mask" msgstr "" -#: apps/permission/models.py:112 +#: apps/permission/models.py:121 msgid "permission masks" msgstr "" -#: apps/permission/models.py:152 +#: apps/permission/models.py:127 +msgid "add" +msgstr "" + +#: apps/permission/models.py:128 +msgid "view" +msgstr "" + +#: apps/permission/models.py:129 +msgid "change" +msgstr "" + +#: apps/permission/models.py:161 msgid "query" msgstr "" -#: apps/permission/models.py:165 +#: apps/permission/models.py:174 msgid "mask" msgstr "" -#: apps/permission/models.py:171 +#: apps/permission/models.py:180 msgid "field" msgstr "" -#: apps/permission/models.py:176 +#: apps/permission/models.py:185 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." msgstr "" -#: apps/permission/models.py:177 templates/permission/all_rights.html:26 +#: apps/permission/models.py:186 templates/permission/all_rights.html:26 msgid "permanent" msgstr "" -#: apps/permission/models.py:188 +#: apps/permission/models.py:197 msgid "permission" msgstr "" -#: apps/permission/models.py:189 apps/permission/models.py:328 +#: apps/permission/models.py:198 apps/permission/models.py:337 msgid "permissions" msgstr "" -#: apps/permission/models.py:194 +#: apps/permission/models.py:203 msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/permission/models.py:333 +#: apps/permission/models.py:342 msgid "for club" msgstr "" -#: apps/permission/models.py:343 apps/permission/models.py:344 +#: apps/permission/models.py:352 apps/permission/models.py:353 msgid "role permissions" msgstr "" @@ -1000,7 +1012,7 @@ msgid "" "{model_name}." msgstr "" -#: apps/permission/views.py:44 templates/base.html:135 +#: apps/permission/views.py:44 templates/base.html:136 msgid "Rights" msgstr "" @@ -1133,7 +1145,7 @@ msgstr "" msgid "Description" msgstr "" -#: apps/treasury/models.py:48 templates/note/transaction_form.html:120 +#: apps/treasury/models.py:48 templates/note/transaction_form.html:121 msgid "Name" msgstr "" @@ -1534,113 +1546,113 @@ msgstr "" msgid "members" msgstr "" -#: apps/wei/views.py:55 +#: apps/wei/views.py:56 msgid "Search WEI" msgstr "" -#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9 +#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "" -#: apps/wei/views.py:84 +#: apps/wei/views.py:94 msgid "WEI Detail" msgstr "" -#: apps/wei/views.py:179 +#: apps/wei/views.py:189 msgid "View members of the WEI" msgstr "" -#: apps/wei/views.py:207 +#: apps/wei/views.py:217 msgid "Find WEI Membership" msgstr "" -#: apps/wei/views.py:217 +#: apps/wei/views.py:227 msgid "View registrations to the WEI" msgstr "" -#: apps/wei/views.py:243 +#: apps/wei/views.py:253 msgid "Find WEI Registration" msgstr "" -#: apps/wei/views.py:254 +#: apps/wei/views.py:264 msgid "Update the WEI" msgstr "" -#: apps/wei/views.py:275 +#: apps/wei/views.py:285 msgid "Create new bus" msgstr "" -#: apps/wei/views.py:306 +#: apps/wei/views.py:316 msgid "Update bus" msgstr "" -#: apps/wei/views.py:336 +#: apps/wei/views.py:346 msgid "Manage bus" msgstr "" -#: apps/wei/views.py:363 +#: apps/wei/views.py:373 msgid "Create new team" msgstr "" -#: apps/wei/views.py:395 +#: apps/wei/views.py:405 msgid "Update team" msgstr "" -#: apps/wei/views.py:426 +#: apps/wei/views.py:436 msgid "Manage WEI team" msgstr "" -#: apps/wei/views.py:448 +#: apps/wei/views.py:458 msgid "Register first year student to the WEI" msgstr "" -#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "" -#: apps/wei/views.py:481 apps/wei/views.py:551 +#: apps/wei/views.py:491 apps/wei/views.py:561 msgid "This user is already registered to this WEI." msgstr "" -#: apps/wei/views.py:486 +#: apps/wei/views.py:496 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." msgstr "" -#: apps/wei/views.py:503 +#: apps/wei/views.py:513 msgid "Register old student to the WEI" msgstr "" -#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:533 apps/wei/views.py:621 +#: apps/wei/views.py:543 apps/wei/views.py:631 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:581 +#: apps/wei/views.py:591 msgid "Update WEI Registration" msgstr "" -#: apps/wei/views.py:671 +#: apps/wei/views.py:681 msgid "Delete WEI registration" msgstr "" -#: apps/wei/views.py:682 +#: apps/wei/views.py:692 msgid "You don't have the right to delete this WEI registration." msgstr "" -#: apps/wei/views.py:701 +#: apps/wei/views.py:711 msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:782 +#: apps/wei/views.py:792 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882 +#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1775,11 +1787,11 @@ msgstr "" msgid "Registrations" msgstr "" -#: templates/base.html:139 +#: templates/base.html:141 msgid "Administration" msgstr "" -#: templates/base.html:178 +#: templates/base.html:180 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -1950,7 +1962,7 @@ msgstr "" msgid "Double consumptions" msgstr "" -#: templates/note/conso_form.html:150 templates/note/transaction_form.html:151 +#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152 msgid "Recent transactions history" msgstr "" @@ -1974,7 +1986,7 @@ msgstr "" msgid "Reason" msgstr "" -#: templates/note/transaction_form.html:110 +#: templates/note/transaction_form.html:111 msgid "Transfer type" msgstr "" @@ -2022,6 +2034,10 @@ msgstr "" msgid "Own this role in the clubs" msgstr "" +#: templates/permission/all_rights.html:26 +msgid "Mask:" +msgstr "" + #: templates/permission/all_rights.html:26 msgid "Query:" msgstr "" @@ -2366,7 +2382,7 @@ msgstr "" msgid "View WEI" msgstr "" -#: templates/wei/weiclub_list.html:16 +#: templates/wei/weiclub_list.html:18 msgid "WEI listing" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 91c6f1f7..6f12391c 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-31 17:00+0200\n" +"POT-Creation-Date: 2020-07-31 22:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:151 apps/note/models/notes.py:188 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:261 apps/permission/models.py:323 +#: apps/note/models/transactions.py:263 apps/permission/models.py:332 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -72,14 +72,14 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:53 apps/note/models/transactions.py:81 -#: apps/permission/models.py:104 apps/permission/models.py:183 +#: apps/permission/models.py:113 apps/permission/models.py:192 #: apps/wei/models.py:71 apps/wei/models.py:128 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "description" #: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:66 apps/permission/models.py:158 +#: apps/note/models/transactions.py:66 apps/permission/models.py:167 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" @@ -194,7 +194,7 @@ msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:107 #: apps/registration/forms.py:69 apps/treasury/forms.py:122 -#: templates/note/transaction_form.html:126 +#: templates/note/transaction_form.html:127 msgid "First name" msgstr "Prénom" @@ -242,7 +242,7 @@ msgstr "Logs" msgid "IP Address" msgstr "Adresse IP" -#: apps/logs/models.py:35 apps/permission/models.py:128 +#: apps/logs/models.py:35 apps/permission/models.py:137 msgid "model" msgstr "Modèle" @@ -268,7 +268,7 @@ msgid "edit" msgstr "Modifier" #: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166 -#: apps/wei/tables.py:65 +#: apps/permission/models.py:130 apps/wei/tables.py:65 msgid "delete" msgstr "Supprimer" @@ -325,7 +325,7 @@ msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:112 apps/registration/forms.py:74 -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132 +#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133 msgid "Bank" msgstr "Banque" @@ -538,7 +538,7 @@ msgstr "l'adhésion finit le" msgid "fee" msgstr "cotisation" -#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787 +#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" @@ -618,7 +618,7 @@ msgstr "Modifier le club" msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:529 apps/wei/views.py:778 +#: apps/member/views.py:529 apps/wei/views.py:788 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -837,36 +837,36 @@ msgstr "" "La transaction ne peut pas être sauvegardée puisque la note source ou la " "note de destination n'est pas active." -#: apps/note/models/transactions.py:228 +#: apps/note/models/transactions.py:230 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 -#: templates/note/transaction_form.html:140 +#: templates/note/transaction_form.html:141 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:251 +#: apps/note/models/transactions.py:253 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:266 +#: apps/note/models/transactions.py:268 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:271 +#: apps/note/models/transactions.py:273 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:277 +#: apps/note/models/transactions.py:279 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:290 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -874,11 +874,11 @@ msgstr "" "Une transaction spéciale n'est possible que entre une note associée à un " "mode de paiement et un utilisateur ou un club." -#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310 +#: apps/note/models/transactions.py:307 apps/note/models/transactions.py:312 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:306 apps/treasury/models.py:227 +#: apps/note/models/transactions.py:308 apps/treasury/models.py:227 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -927,41 +927,53 @@ msgstr "Modifier le bouton" msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:83 +#: apps/permission/models.py:92 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "Can {type} {model}.{field} in {query}" -#: apps/permission/models.py:85 +#: apps/permission/models.py:94 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "Can {type} {model} in {query}" -#: apps/permission/models.py:98 +#: apps/permission/models.py:107 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:111 +#: apps/permission/models.py:120 msgid "permission mask" msgstr "masque de permissions" -#: apps/permission/models.py:112 +#: apps/permission/models.py:121 msgid "permission masks" msgstr "masques de permissions" -#: apps/permission/models.py:152 +#: apps/permission/models.py:127 +msgid "add" +msgstr "ajouter" + +#: apps/permission/models.py:128 +msgid "view" +msgstr "voir" + +#: apps/permission/models.py:129 +msgid "change" +msgstr "modifier" + +#: apps/permission/models.py:161 msgid "query" msgstr "requête" -#: apps/permission/models.py:165 +#: apps/permission/models.py:174 msgid "mask" msgstr "masque" -#: apps/permission/models.py:171 +#: apps/permission/models.py:180 msgid "field" msgstr "champ" -#: apps/permission/models.py:176 +#: apps/permission/models.py:185 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." @@ -969,29 +981,29 @@ msgstr "" "Indique si la permission doit être attribuée même si l'adhésion de " "l'utilisateur est expirée." -#: apps/permission/models.py:177 templates/permission/all_rights.html:26 +#: apps/permission/models.py:186 templates/permission/all_rights.html:26 msgid "permanent" msgstr "permanent" -#: apps/permission/models.py:188 +#: apps/permission/models.py:197 msgid "permission" msgstr "permission" -#: apps/permission/models.py:189 apps/permission/models.py:328 +#: apps/permission/models.py:198 apps/permission/models.py:337 msgid "permissions" msgstr "permissions" -#: apps/permission/models.py:194 +#: apps/permission/models.py:203 msgid "Specifying field applies only to view and change permission types." msgstr "" "Spécifie le champ concerné, ne fonctionne que pour les permissions view et " "change." -#: apps/permission/models.py:333 +#: apps/permission/models.py:342 msgid "for club" msgstr "s'applique au club" -#: apps/permission/models.py:343 apps/permission/models.py:344 +#: apps/permission/models.py:352 apps/permission/models.py:353 msgid "role permissions" msgstr "Permissions par rôles" @@ -1022,7 +1034,7 @@ msgstr "" "Vous n'avez pas la permission de supprimer cette instance du modèle " "{app_label}.{model_name}." -#: apps/permission/views.py:44 templates/base.html:135 +#: apps/permission/views.py:44 templates/base.html:136 msgid "Rights" msgstr "Droits" @@ -1160,7 +1172,7 @@ msgstr "Objet" msgid "Description" msgstr "Description" -#: apps/treasury/models.py:48 templates/note/transaction_form.html:120 +#: apps/treasury/models.py:48 templates/note/transaction_form.html:121 msgid "Name" msgstr "Nom" @@ -1578,75 +1590,75 @@ msgstr "Nombre de membres" msgid "members" msgstr "adhérents" -#: apps/wei/views.py:55 +#: apps/wei/views.py:56 msgid "Search WEI" msgstr "Chercher un WEI" -#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9 +#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "Créer un WEI" -#: apps/wei/views.py:84 +#: apps/wei/views.py:94 msgid "WEI Detail" msgstr "Détails du WEI" -#: apps/wei/views.py:179 +#: apps/wei/views.py:189 msgid "View members of the WEI" msgstr "Voir les membres du WEI" -#: apps/wei/views.py:207 +#: apps/wei/views.py:217 msgid "Find WEI Membership" msgstr "Trouver une adhésion au WEI" -#: apps/wei/views.py:217 +#: apps/wei/views.py:227 msgid "View registrations to the WEI" msgstr "Voir les inscriptions au WEI" -#: apps/wei/views.py:243 +#: apps/wei/views.py:253 msgid "Find WEI Registration" msgstr "Trouver une inscription au WEI" -#: apps/wei/views.py:254 +#: apps/wei/views.py:264 msgid "Update the WEI" msgstr "Modifier le WEI" -#: apps/wei/views.py:275 +#: apps/wei/views.py:285 msgid "Create new bus" msgstr "Ajouter un nouveau bus" -#: apps/wei/views.py:306 +#: apps/wei/views.py:316 msgid "Update bus" msgstr "Modifier le bus" -#: apps/wei/views.py:336 +#: apps/wei/views.py:346 msgid "Manage bus" msgstr "Gérer le bus" -#: apps/wei/views.py:363 +#: apps/wei/views.py:373 msgid "Create new team" msgstr "Créer une nouvelle équipe" -#: apps/wei/views.py:395 +#: apps/wei/views.py:405 msgid "Update team" msgstr "Modifier l'équipe" -#: apps/wei/views.py:426 +#: apps/wei/views.py:436 msgid "Manage WEI team" msgstr "Gérer l'équipe WEI" -#: apps/wei/views.py:448 +#: apps/wei/views.py:458 msgid "Register first year student to the WEI" msgstr "Inscrire un 1A au WEI" -#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:481 apps/wei/views.py:551 +#: apps/wei/views.py:491 apps/wei/views.py:561 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." -#: apps/wei/views.py:486 +#: apps/wei/views.py:496 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." @@ -1654,39 +1666,39 @@ msgstr "" "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà " "participé à un WEI." -#: apps/wei/views.py:503 +#: apps/wei/views.py:513 msgid "Register old student to the WEI" msgstr "Inscrire un 2A+ au WEI" -#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:533 apps/wei/views.py:621 +#: apps/wei/views.py:543 apps/wei/views.py:631 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:581 +#: apps/wei/views.py:591 msgid "Update WEI Registration" msgstr "Modifier l'inscription WEI" -#: apps/wei/views.py:671 +#: apps/wei/views.py:681 msgid "Delete WEI registration" msgstr "Supprimer l'inscription WEI" -#: apps/wei/views.py:682 +#: apps/wei/views.py:692 msgid "You don't have the right to delete this WEI registration." msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." -#: apps/wei/views.py:701 +#: apps/wei/views.py:711 msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:782 +#: apps/wei/views.py:792 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882 +#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1830,11 +1842,11 @@ msgstr "Clubs" msgid "Registrations" msgstr "Inscriptions" -#: templates/base.html:139 +#: templates/base.html:141 msgid "Administration" msgstr "Administration" -#: templates/base.html:178 +#: templates/base.html:180 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -2010,7 +2022,7 @@ msgstr "Consommations simples" msgid "Double consumptions" msgstr "Consommations doubles" -#: templates/note/conso_form.html:150 templates/note/transaction_form.html:151 +#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152 msgid "Recent transactions history" msgstr "Historique des transactions récentes" @@ -2034,7 +2046,7 @@ msgstr "Action" msgid "Reason" msgstr "Raison" -#: templates/note/transaction_form.html:110 +#: templates/note/transaction_form.html:111 msgid "Transfer type" msgstr "Type de transfert" @@ -2082,6 +2094,10 @@ msgstr "Filtrer les rôles que je possède dans au moins un club" msgid "Own this role in the clubs" msgstr "Possède ce rôle dans les clubs" +#: templates/permission/all_rights.html:26 +msgid "Mask:" +msgstr "Masque :" + #: templates/permission/all_rights.html:26 msgid "Query:" msgstr "Requête :" @@ -2470,7 +2486,7 @@ msgstr "Ajouter un bus" msgid "View WEI" msgstr "Voir le WEI" -#: templates/wei/weiclub_list.html:16 +#: templates/wei/weiclub_list.html:18 msgid "WEI listing" msgstr "Liste des WEI" diff --git a/templates/base.html b/templates/base.html index 744a8714..2d940e2b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -131,9 +131,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'WEI' %} {% endif %} -
  • - {% trans 'Rights' %} -
    • + {% if user.is_authenticated %} +
  • + {% trans 'Rights' %} +
    • + {% endif %} {% if user.is_staff and ""|has_perm:user %}
  • {% trans 'Administration' %} diff --git a/templates/permission/all_rights.html b/templates/permission/all_rights.html index 80337134..9bb6faf5 100644 --- a/templates/permission/all_rights.html +++ b/templates/permission/all_rights.html @@ -23,7 +23,7 @@ {% endif %}
      {% for permission in role.permissions.all %} -
    • {{ permission }} ({{ permission.type }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})
      • +
    • {{ permission }} ({{ permission.get_type_display }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})
      • {% empty %} {% trans "No associated permission" %} {% endfor %}