add - modify state to permissions
This commit is contained in:
@@ -146,7 +146,7 @@ class PermissionViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
|
||||
class UserRelationViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):
|
||||
""" Crud Operations for User Relations """
|
||||
|
||||
queryset = UserRelations.objects.all()
|
||||
queryset = UserRelations.objects.select_related('organization', 'role', 'user')
|
||||
serializer_class = UserRelationSerializer
|
||||
filter_backends = [filters.SearchFilter]
|
||||
search_fields = [
|
||||
|
||||
@@ -47,7 +47,8 @@ class PermissionSerializer(serializers.ModelSerializer):
|
||||
'description',
|
||||
'category',
|
||||
'page',
|
||||
'is_active'
|
||||
'is_active',
|
||||
'modify_state'
|
||||
]
|
||||
|
||||
def to_representation(self, instance):
|
||||
@@ -107,9 +108,6 @@ class RoleSerializer(serializers.ModelSerializer):
|
||||
representation['type'] = auth_serializer.OrganizationTypeSerializer(instance.type).data
|
||||
if instance.parent_role:
|
||||
representation['parent_role'] = {'name': instance.parent_role.role_name, 'id': instance.parent_role.id}
|
||||
if instance.permissions: # noqa
|
||||
permissions = instance.permissions.filter(is_active=True)
|
||||
representation['permissions'] = PermissionSerializer(permissions, many=True).data
|
||||
return representation
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user