mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-16 15:28:38 +00:00
fix: user option error
This commit is contained in:
@@ -7,6 +7,7 @@ from typing import Callable
|
|||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.signals import m2m_changed
|
from django.db.models.signals import m2m_changed
|
||||||
|
from common.utils import is_uuid
|
||||||
from rest_framework.request import Request
|
from rest_framework.request import Request
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from rest_framework.settings import api_settings
|
from rest_framework.settings import api_settings
|
||||||
@@ -95,6 +96,13 @@ class QuerySetMixin:
|
|||||||
request: Request
|
request: Request
|
||||||
get_serializer_class: Callable
|
get_serializer_class: Callable
|
||||||
get_queryset: Callable
|
get_queryset: Callable
|
||||||
|
slug_field = 'name'
|
||||||
|
|
||||||
|
def get_object(self):
|
||||||
|
pk = self.kwargs.get(self.lookup_field)
|
||||||
|
if not pk or is_uuid(pk) or pk.isdigit():
|
||||||
|
return super().get_object()
|
||||||
|
return self.get_queryset().get(**{self.slug_field: pk})
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
return super().get_queryset()
|
return super().get_queryset()
|
||||||
|
@@ -51,12 +51,7 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, SuggestionMixin, BulkModelV
|
|||||||
'remove': 'users.remove_user',
|
'remove': 'users.remove_user',
|
||||||
'bulk_remove': 'users.remove_user',
|
'bulk_remove': 'users.remove_user',
|
||||||
}
|
}
|
||||||
|
slug_field = 'username'
|
||||||
def get_object(self):
|
|
||||||
pk = self.kwargs.get(self.lookup_field)
|
|
||||||
if not is_uuid(pk):
|
|
||||||
return self.get_queryset().get(username=pk)
|
|
||||||
return super().get_object()
|
|
||||||
|
|
||||||
def allow_bulk_destroy(self, qs, filtered):
|
def allow_bulk_destroy(self, qs, filtered):
|
||||||
is_valid = filtered.count() < qs.count()
|
is_valid = filtered.count() < qs.count()
|
||||||
|
Reference in New Issue
Block a user