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

fix: 邀请用没有触发信号

pull/5949/head
xinwen 2021-04-13 15:46:49 +08:00 committed by 老广
parent 68b6236de2
commit b97759687d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
# ~*~ coding: utf-8 ~*~ # ~*~ coding: utf-8 ~*~
from django.core.cache import cache from collections import defaultdict
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from rest_framework.decorators import action from rest_framework.decorators import action
from django.conf import settings
from rest_framework import generics from rest_framework import generics
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework_bulk import BulkModelViewSet from rest_framework_bulk import BulkModelViewSet
@ -155,10 +155,17 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet):
serializer = serializer_cls(data=data, many=True) serializer = serializer_cls(data=data, many=True)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
validated_data = serializer.validated_data validated_data = serializer.validated_data
users_by_role = defaultdict(list)
for i in validated_data: for i in validated_data:
i['org_id'] = current_org.org_id() users_by_role[i['role']].append(i['user'])
relations = [OrganizationMember(**i) for i in validated_data]
OrganizationMember.objects.bulk_create(relations, ignore_conflicts=True) OrganizationMember.objects.add_users_by_role(
current_org,
users=users_by_role[ORG_ROLE.USER],
admins=users_by_role[ORG_ROLE.ADMIN],
auditors=users_by_role[ORG_ROLE.AUDITOR]
)
return Response(serializer.data, status=201) return Response(serializer.data, status=201)
@action(methods=['post'], detail=True, permission_classes=(IsOrgAdmin,)) @action(methods=['post'], detail=True, permission_classes=(IsOrgAdmin,))