github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 删除全部用户错误提示 (#10546) 

Co-authored-by: feng <1304903146@qq.com>
pull/10550/head
fit2bot 2023-05-25 11:38:20 +08:00 committed by GitHub
parent cabdc3ad42
commit 32a8e150da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 422 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/locale/ja/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:523a93e9703e62c39440d2e172c96fea7d8d04965cab43095fc8a378d157bf59 oid sha256:fc0862f2a9091f2e06602d6db26cfc9cc7a6b067012ec56b41ebc1e26d5072e9
size 141798 size 142045

384
apps/locale/ja/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

4
apps/locale/zh/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bd60ca8b6c43b9b5940b14a8ca8073ae26062a5402f663ac39043cbc669199bd oid sha256:1fabd2ec950291422c14b66af097bd73cce52bbc4b7913c1b9ea732eee855901
size 116040 size 116210

384
apps/locale/zh/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

9
apps/users/api/user.py
View File

@ -16,6 +16,7 @@ from rbac.permissions import RBACPermission
from users.utils import LoginBlockUtil, MFABlockUtils from users.utils import LoginBlockUtil, MFABlockUtils
from .mixins import UserQuerysetMixin from .mixins import UserQuerysetMixin
from .. import serializers from .. import serializers
from ..exceptions import UnableToDeleteAllUsers
from ..filters import UserFilter from ..filters import UserFilter
from ..models import User from ..models import User
from ..notifications import ResetMFAMsg from ..notifications import ResetMFAMsg
@ -55,6 +56,12 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, SuggestionMixin, BulkModelV
queryset = super().get_queryset().prefetch_related('groups') queryset = super().get_queryset().prefetch_related('groups')
return queryset return queryset
def allow_bulk_destroy(self, qs, filtered):
is_valid = filtered.count() < qs.count()
if not is_valid:
raise UnableToDeleteAllUsers()
return True
@action(methods=['get'], detail=False, url_path='suggestions') @action(methods=['get'], detail=False, url_path='suggestions')
def match(self, request, *args, **kwargs): def match(self, request, *args, **kwargs):
with tmp_to_root_org(): with tmp_to_root_org():
@ -111,8 +118,6 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, SuggestionMixin, BulkModelV
self.check_object_permissions(self.request, user) self.check_object_permissions(self.request, user)
return super().perform_bulk_update(serializer) return super().perform_bulk_update(serializer)
def allow_bulk_destroy(self, qs, filtered):
return filtered.count() < qs.count()
def perform_bulk_destroy(self, objects): def perform_bulk_destroy(self, objects):
for obj in objects: for obj in objects:

6
apps/users/exceptions.py
View File

@ -15,6 +15,6 @@ class PhoneNotSet(JMSException):
default_detail = _('Phone not set') default_detail = _('Phone not set')
class MFAMethodNotSupport(JMSException): class UnableToDeleteAllUsers(JMSException):
default_code = 'mfa_not_support' default_code = 'unable_to_delete_all_users'
default_detail = _('MFA method not support') default_detail = _('Unable to delete all users')