From c5d7eb9d30c6986405a6bc06676965a97170ca28 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Mon, 7 Sep 2020 14:49:41 +0200 Subject: [PATCH] Move permission handling to loadkfetdevdata --- kfet/auth/models.py | 12 +----------- kfet/management/commands/loadkfetdevdata.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/kfet/auth/models.py b/kfet/auth/models.py index 2946d537..865852cd 100644 --- a/kfet/auth/models.py +++ b/kfet/auth/models.py @@ -37,19 +37,9 @@ class KFetPermission(Permission): class KFetGroup(Group): - # Même si on n'ajoute que des méthodes, on fait un héritage complet pour + # On fait un héritage complet pour # mieux distinguer les groupes K-Fêt via l'ORM (i.e. faire `KFetGroup.objects.all`) - def give_admin_access(self): - perms = KFetPermission.objects.all() - self.permissions.add(*perms) - - def give_staff_access(self): - perms = KFetPermission.objects.filter( - codename__in=["is_team", "perform_deposit", "add_account", "add_transfer"] - ) - self.permissions.add(*perms) - class Meta: verbose_name = _("Groupe K-Fêt") verbose_name_plural = _("Groupes K-Fêt") diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py index 83957e0f..43b14b09 100644 --- a/kfet/management/commands/loadkfetdevdata.py +++ b/kfet/management/commands/loadkfetdevdata.py @@ -12,7 +12,7 @@ from django.utils import timezone from gestioncof.management.base import MyBaseCommand from gestioncof.models import CofProfile -from kfet.auth.models import KFetGroup +from kfet.auth.models import KFetGroup, KFetPermission from kfet.models import ( Account, Article, @@ -37,8 +37,14 @@ class Command(MyBaseCommand): group_chef, _ = KFetGroup.objects.get_or_create(name="K-Fêt César") group_boy, _ = KFetGroup.objects.get_or_create(name="K-Fêt Légionnaire") - group_chef.give_admin_access() - group_chef.give_staff_access() + # Give relevant permissions to both groups + chef_perms = KFetPermission.objects.all() + group_chef.permissions.add(*chef_perms) + + boy_perms = KFetPermission.objects.filter( + codename__in=["is_team", "perform_deposit", "add_account", "add_transfer"] + ) + group_boy.permissions.add(*boy_perms) # --- # Comptes