github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 18:31:04 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改public api

Browse Source
This commit is contained in:
ibuler
2020-05-18 14:55:16 +08:00
parent 1540cbdcaa
commit 76ef9b292b
6 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/users/serializers/user.py
View File

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
from common.utils import validate_ssh_public_key
from common.mixins import CommonSerializerMixin
from common.mixins import CommonBulkSerializerMixin
from common.serializers import AdaptedBulkListSerializer
from common.permissions import CanUpdateDeleteUser
from ..models import User
@@ -23,7 +23,7 @@ class UserOrgSerializer(serializers.Serializer):
name = serializers.CharField()
class UserSerializer(CommonSerializerMixin, serializers.ModelSerializer):
class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
EMAIL_SET_PASSWORD = _('Reset link will be generated and sent to the user')
CUSTOM_PASSWORD = _('Set password')
PASSWORD_STRATEGY_CHOICES = (
@@ -108,6 +108,9 @@ class UserSerializer(CommonSerializerMixin, serializers.ModelSerializer):
return password
def validate_groups(self, groups):
"""
审计员不能加入到组中
"""
role = self.initial_data.get('role')
if self.instance:
role = role or self.instance.role