Various fixes

This commit is contained in:
Antoine Nguyen
2025-06-24 18:15:40 +02:00
parent cd73a19596
commit 205bc4d057
26 changed files with 58 additions and 95 deletions
+1 -3
View File
@@ -1,7 +1,5 @@
"""Admin serializers."""
from typing import List
from django.contrib.auth import password_validation
from django.core.exceptions import ValidationError
from django.shortcuts import get_object_or_404
@@ -277,7 +275,7 @@ class AccountSerializer(serializers.ModelSerializer):
"""Return role."""
return account.role
def get_domains(self, account) -> List[str]:
def get_domains(self, account) -> list[str]:
"""Return domains administered by this account."""
if account.role not in ["DomainAdmins", "Resellers"]:
return []
+2 -3
View File
@@ -2,7 +2,6 @@
import ipaddress
import os
from typing import List
from django.conf import settings
from django.core.exceptions import ValidationError
@@ -388,7 +387,7 @@ class AccountMeSerializer(v1_serializers.AccountSerializer):
class Meta(v1_serializers.AccountSerializer.Meta):
fields = v1_serializers.AccountSerializer.Meta.fields + ("permissions",)
def get_permissions(self, user) -> List[str]:
def get_permissions(self, user) -> list[str]:
"""Return available permissions for given user."""
permissions = (
user.user_permissions.all() | Permission.objects.filter(group__user=user)
@@ -412,7 +411,7 @@ class AccountSerializer(v1_serializers.AccountSerializer):
return
self.fields["resources"] = serializers.SerializerMethodField()
def get_resources(self, account) -> List[AccountResourceSerializer]:
def get_resources(self, account) -> list[AccountResourceSerializer]:
if account.role == "SimpleUsers":
return []
resources = []