github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-08 02:39:22 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改assets users api

Browse Source
This commit is contained in:
ibuler
2019-06-25 14:32:25 +08:00
parent f10a7a75ae
commit e8ebc94191
12 changed files with 88 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,10 @@ class UserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
def perform_create(self, serializer):
users = serializer.save()
for user in users:
if current_org and current_org.is_real():
user.orgs.add(current_org.id)
if isinstance(users, User):
users = [users]
if current_org and current_org.is_real():
current_org.users.add(*users)
self.send_created_signal(users)
def get_queryset(self):
@@ -174,6 +175,7 @@ class UserResetPKApi(generics.UpdateAPIView):
send_reset_ssh_key_mail(user)
# 废弃
class UserUpdatePKApi(generics.UpdateAPIView):
queryset = User.objects.all()
serializer_class = UserPKUpdateSerializer
@@ -181,7 +183,7 @@ class UserUpdatePKApi(generics.UpdateAPIView):
def perform_update(self, serializer):
user = self.get_object()
user.public_key = serializer.validated_data['_public_key']
user.public_key = serializer.validated_data['public_key']
user.save()