mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-12 08:53:56 +01:00
Various fixes
This commit is contained in:
@@ -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,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 = []
|
||||
|
||||
Reference in New Issue
Block a user