github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-13 06:34:42 +00:00
Code Issues Projects Releases Wiki Activity

fix(users): 修复用户与用户组关系变化时没触发信号

Browse Source
This commit is contained in:
xinwen 2020-08-12 17:21:04 +08:00 committed by 老广
parent 962ea67b84
commit 4cf5573c36
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/users/api/relation.py
View File

@ -1,9 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from rest_framework_bulk import BulkModelViewSet
from django.db.models import F from django.db.models import F
from common.drf.api import JMSBulkRelationModelViewSet
from common.permissions import IsOrgAdmin from common.permissions import IsOrgAdmin
from .. import serializers from .. import serializers
from ..models import User from ..models import User
@ -11,17 +11,17 @@ from ..models import User
__all__ = ['UserUserGroupRelationViewSet'] __all__ = ['UserUserGroupRelationViewSet']
class UserUserGroupRelationViewSet(BulkModelViewSet): class UserUserGroupRelationViewSet(JMSBulkRelationModelViewSet):
filter_fields = ('user', 'usergroup') filter_fields = ('user', 'usergroup')
search_fields = filter_fields search_fields = filter_fields
serializer_class = serializers.UserUserGroupRelationSerializer serializer_class = serializers.UserUserGroupRelationSerializer
permission_classes = (IsOrgAdmin,) permission_classes = (IsOrgAdmin,)
m2m_field = User.groups.field
def get_queryset(self): def get_queryset(self):
queryset = User.groups.through.objects.all()\ return super().get_queryset().annotate(
.annotate(user_display=F('user__name'))\ user_display=F('user__name'), usergroup_display=F('usergroup__name')
.annotate(usergroup_display=F('usergroup__name')) )
return queryset
def allow_bulk_destroy(self, qs, filtered): def allow_bulk_destroy(self, qs, filtered):
if filtered.count() != 1: if filtered.count() != 1: