mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 09:12:11 +01:00 
			
		
		
		
	Merge Role and RolePermissions
This commit is contained in:
		@@ -3,7 +3,7 @@
 | 
			
		||||
 | 
			
		||||
from rest_framework import serializers
 | 
			
		||||
 | 
			
		||||
from ..models import Profile, Club, Role, Membership
 | 
			
		||||
from ..models import Profile, Club, Membership
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ProfileSerializer(serializers.ModelSerializer):
 | 
			
		||||
@@ -29,17 +29,6 @@ class ClubSerializer(serializers.ModelSerializer):
 | 
			
		||||
        fields = '__all__'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class RoleSerializer(serializers.ModelSerializer):
 | 
			
		||||
    """
 | 
			
		||||
    REST API Serializer for Roles.
 | 
			
		||||
    The djangorestframework plugin will analyse the model `Role` and parse all fields in the API.
 | 
			
		||||
    """
 | 
			
		||||
 | 
			
		||||
    class Meta:
 | 
			
		||||
        model = Role
 | 
			
		||||
        fields = '__all__'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class MembershipSerializer(serializers.ModelSerializer):
 | 
			
		||||
    """
 | 
			
		||||
    REST API Serializer for Memberships.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 | 
			
		||||
# SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
 | 
			
		||||
from .views import ProfileViewSet, ClubViewSet, RoleViewSet, MembershipViewSet
 | 
			
		||||
from .views import ProfileViewSet, ClubViewSet, MembershipViewSet
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def register_members_urls(router, path):
 | 
			
		||||
@@ -10,5 +10,4 @@ def register_members_urls(router, path):
 | 
			
		||||
    """
 | 
			
		||||
    router.register(path + '/profile', ProfileViewSet)
 | 
			
		||||
    router.register(path + '/club', ClubViewSet)
 | 
			
		||||
    router.register(path + '/role', RoleViewSet)
 | 
			
		||||
    router.register(path + '/membership', MembershipViewSet)
 | 
			
		||||
 
 | 
			
		||||
@@ -4,8 +4,8 @@
 | 
			
		||||
from rest_framework.filters import SearchFilter
 | 
			
		||||
from api.viewsets import ReadProtectedModelViewSet
 | 
			
		||||
 | 
			
		||||
from .serializers import ProfileSerializer, ClubSerializer, RoleSerializer, MembershipSerializer
 | 
			
		||||
from ..models import Profile, Club, Role, Membership
 | 
			
		||||
from .serializers import ProfileSerializer, ClubSerializer, MembershipSerializer
 | 
			
		||||
from ..models import Profile, Club, Membership
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ProfileViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
@@ -30,18 +30,6 @@ class ClubViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    search_fields = ['$name', ]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class RoleViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    """
 | 
			
		||||
    REST API View set.
 | 
			
		||||
    The djangorestframework plugin will get all `Role` objects, serialize it to JSON with the given serializer,
 | 
			
		||||
    then render it on /api/members/role/
 | 
			
		||||
    """
 | 
			
		||||
    queryset = Role.objects.all()
 | 
			
		||||
    serializer_class = RoleSerializer
 | 
			
		||||
    filter_backends = [SearchFilter]
 | 
			
		||||
    search_fields = ['$name', ]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class MembershipViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    """
 | 
			
		||||
    REST API View set.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user