ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 18:08:21 +02:00
Code Issues Releases Wiki Activity

Merge Role and RolePermissions

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-07-25 19:40:30 +02:00
parent 0b6cb4ef19
commit fb5e2578af
17 changed files with 135 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/permission/admin.py
View File

@ -3,7 +3,7 @@
from django.contrib import admin
from .models import Permission, PermissionMask, RolePermissions
from .models import Permission, PermissionMask, Role
@admin.register(PermissionMask)
@ -22,9 +22,9 @@ class PermissionAdmin(admin.ModelAdmin):
list_display = ('type', 'model', 'field', 'mask', 'description', )
@admin.register(RolePermissions)
class RolePermissionsAdmin(admin.ModelAdmin):
@admin.register(Role)
class RoleAdmin(admin.ModelAdmin):
"""
Admin customisation for RolePermissions
Admin customisation for Role
"""
list_display = ('role', )
list_display = ('name', )

10
apps/permission/api/serializers.py
View File

@ -3,7 +3,7 @@
from rest_framework import serializers
from ..models import Permission, RolePermissions
from ..models import Permission, Role
class PermissionSerializer(serializers.ModelSerializer):
@ -17,12 +17,12 @@ class PermissionSerializer(serializers.ModelSerializer):
fields = '__all__'
class RolePermissionsSerializer(serializers.ModelSerializer):
class RoleSerializer(serializers.ModelSerializer):
"""
REST API Serializer for RolePermissions types.
The djangorestframework plugin will analyse the model `RolePermissions` and parse all fields in the API.
REST API Serializer for Role types.
The djangorestframework plugin will analyse the model `Role` and parse all fields in the API.
"""
class Meta:
model = RolePermissions
model = Role
fields = '__all__'

4
apps/permission/api/urls.py
View File

@ -1,7 +1,7 @@
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from .views import PermissionViewSet, RolePermissionsViewSet
from .views import PermissionViewSet, RoleViewSet
def register_permission_urls(router, path):
@ -9,4 +9,4 @@ def register_permission_urls(router, path):
Configure router for permission REST API.
"""
router.register(path + "/permission", PermissionViewSet)
router.register(path + "/roles", RolePermissionsViewSet)
router.register(path + "/roles", RoleViewSet)

10
apps/permission/api/views.py
View File

@ -4,8 +4,8 @@
from django_filters.rest_framework import DjangoFilterBackend
from api.viewsets import ReadOnlyProtectedModelViewSet
from .serializers import PermissionSerializer, RolePermissionsSerializer
from ..models import Permission, RolePermissions
from .serializers import PermissionSerializer, RoleSerializer
from ..models import Permission, Role
class PermissionViewSet(ReadOnlyProtectedModelViewSet):
@ -20,13 +20,13 @@ class PermissionViewSet(ReadOnlyProtectedModelViewSet):
filterset_fields = ['model', 'type', ]
class RolePermissionsViewSet(ReadOnlyProtectedModelViewSet):
class RoleViewSet(ReadOnlyProtectedModelViewSet):
"""
REST API View set.
The djangorestframework plugin will get all `RolePermission` objects, serialize it to JSON with the given serializer
then render it on /api/permission/roles/
"""
queryset = RolePermissions.objects.all()
serializer_class = RolePermissionsSerializer
queryset = Role.objects.all()
serializer_class = RoleSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['role', ]

10
apps/permission/backends.py
View File

@ -37,17 +37,17 @@ class PermissionBackend(ModelBackend):
return Permission.objects.none()
qs = Permission.objects.annotate(
club=F("rolepermissions__role__membership__club"),
membership=F("rolepermissions__role__membership"),
club=F("role__role__membership__club"),
membership=F("role__role__membership"),
).filter(
(
Q(
rolepermissions__role__membership__date_start__lte=timezone.now().today(),
rolepermissions__role__membership__date_end__gte=timezone.now().today(),
role__role__membership__date_start__lte=timezone.now().today(),
role__role__membership__date_end__gte=timezone.now().today(),
)
| Q(permanent=True)
)
& Q(rolepermissions__role__membership__user=user)
& Q(role__role__membership__user=user)
& Q(type=t)
& Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
)

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

@ -1,165 +1,4 @@
[
{
"model": "member.role",
"pk": 1,
"fields": {
"name": "Adh\u00e9rent BDE"
}
},
{
"model": "member.role",
"pk": 2,
"fields": {
"name": "Adh\u00e9rent Kfet"
}
},
{
"model": "member.role",
"pk": 3,
"fields": {
"name": "Membre de club"
}
},
{
"model": "member.role",
"pk": 4,
"fields": {
"name": "Bureau de club"
}
},
{
"model": "member.role",
"pk": 5,
"fields": {
"name": "Pr\u00e9sident\u00b7e de club"
}
},
{
"model": "member.role",
"pk": 6,
"fields": {
"name": "Tr\u00e9sorier\u00b7\u00e8re de club"
}
},
{
"model": "member.role",
"pk": 7,
"fields": {
"name": "Pr\u00e9sident\u00b7e BDE"
}
},
{
"model": "member.role",
"pk": 8,
"fields": {
"name": "Tr\u00e9sorier\u00b7\u00e8re BDE"
}
},
{
"model": "member.role",
"pk": 9,
"fields": {
"name": "Respo info"
}
},
{
"model": "member.role",
"pk": 10,
"fields": {
"name": "GC Kfet"
}
},
{
"model": "member.role",
"pk": 11,
"fields": {
"name": "Res[pot]"
}
},
{
"model": "member.role",
"pk": 12,
"fields": {
"name": "GC WEI"
}
},
{
"model": "member.role",
"pk": 13,
"fields": {
"name": "Chef de bus"
}
},
{
"model": "member.role",
"pk": 14,
"fields": {
"name": "Chef d'\u00e9quipe"
}
},
{
"model": "member.role",
"pk": 15,
"fields": {
"name": "\u00c9lectron libre"
}
},
{
"model": "member.role",
"pk": 16,
"fields": {
"name": "\u00c9lectron libre (avec perm)"
}
},
{
"model": "member.role",
"pk": 17,
"fields": {
"name": "1A"
}
},
{
"model": "member.role",
"pk": 18,
"fields": {
"name": "Adhérent WEI"
}
},
{
"model": "wei.weirole",
"pk": 12,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 13,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 14,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 15,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 16,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 17,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 18,
"fields": {}
},
{
"model": "permission.permissionmask",
"pk": 1,
@ -2217,10 +2056,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 1,
"fields": {
"role": 1,
"name": "Adh\u00e9rent BDE",
"permissions": [
1,
2,
@ -2241,10 +2080,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 2,
"fields": {
"role": 2,
"name": "Adh\u00e9rent Kfet",
"permissions": [
34,
35,
@ -2267,10 +2106,17 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 3,
"fields": {
"name": "Membre de club"
}
},
{
"model": "permission.role",
"pk": 4,
"fields": {
"role": 4,
"name": "Bureau de club",
"permissions": [
22,
47,
@ -2279,10 +2125,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 5,
"fields": {
"role": 5,
"name": "Pr\u00e9sident\u00b7e de club",
"permissions": [
50,
51,
@ -2291,10 +2137,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 6,
"fields": {
"role": 6,
"name": "Tr\u00e9sorier\u00b7\u00e8re de club",
"permissions": [
59,
19,
@ -2309,10 +2155,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 7,
"fields": {
"role": 7,
"name": "Pr\u00e9sident\u00b7e BDE",
"permissions": [
24,
25,
@ -2323,10 +2169,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 8,
"fields": {
"role": 8,
"name": "Tr\u00e9sorier\u00b7\u00e8re BDE",
"permissions": [
23,
24,
@ -2359,10 +2205,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 9,
"fields": {
"role": 9,
"name": "Respo info",
"permissions": [
1,
2,
@ -2494,10 +2340,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 10,
"fields": {
"role": 10,
"name": "GC Kfet",
"permissions": [
32,
33,
@ -2521,10 +2367,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 11,
"fields": {
"role": 11,
"name": "Res[pot]",
"permissions": [
37,
38,
@ -2538,10 +2384,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 12,
"fields": {
"role": 12,
"name": "GC WEI",
"permissions": [
76,
80,
@ -2571,10 +2417,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 13,
"fields": {
"role": 13,
"name": "Chef de bus",
"permissions": [
117,
118,
@ -2586,10 +2432,10 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 14,
"fields": {
"role": 14,
"name": "Chef d'\u00e9quipe",
"permissions": [
116,
123,
@ -2599,10 +2445,31 @@
}
},
{
"model": "permission.rolepermissions",
"model": "permission.role",
"pk": 15,
"fields": {
"name": "\u00c9lectron libre"
}
},
{
"model": "permission.role",
"pk": 16,
"fields": {
"role": 18,
"name": "\u00c9lectron libre (avec perm)"
}
},
{
"model": "permission.role",
"pk": 17,
"fields": {
"name": "1A"
}
},
{
"model": "permission.role",
"pk": 18,
"fields": {
"name": "Adhérent WEI",
"permissions": [
97,
99,
@ -2618,5 +2485,40 @@
95
]
}
},
{
"model": "wei.weirole",
"pk": 12,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 13,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 14,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 15,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 16,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 17,
"fields": {}
},
{
"model": "wei.weirole",
"pk": 18,
"fields": {}
}
]

14
apps/permission/models.py
View File

@ -10,7 +10,6 @@ from django.core.exceptions import ValidationError
from django.db import models
from django.db.models import F, Q, Model
from django.utils.translation import gettext_lazy as _
from member.models import Role
class InstancedPermission:
@ -307,23 +306,22 @@ class Permission(models.Model):
return self.description
class RolePermissions(models.Model):
class Role(models.Model):
"""
Permissions associated with a Role
"""
role = models.OneToOneField(
Role,
on_delete=models.PROTECT,
related_name='permissions',
verbose_name=_('role'),
name = models.CharField(
max_length=255,
verbose_name=_("name"),
)
permissions = models.ManyToManyField(
Permission,
verbose_name=_("permissions"),
)
def __str__(self):
return str(self.role)
return self.name
class Meta:
verbose_name = _("role permissions")

3
apps/permission/views.py
View File

@ -5,9 +5,10 @@ from datetime import date
from django.forms import HiddenInput
from django.utils.translation import gettext_lazy as _
from django.views.generic import UpdateView, TemplateView
from member.models import Role, Membership
from member.models import Membership
from .backends import PermissionBackend
from .models import Role
class ProtectQuerysetMixin: