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

fix: 修复创建更新用户给定默认权限

Browse Source
This commit is contained in:
feng626 2022-03-08 11:40:46 +08:00 committed by Jiangjie.Bai
parent 5081fb5fe7
commit a930f3aab3
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@ from rest_framework import serializers
from common.mixins import CommonBulkSerializerMixin from common.mixins import CommonBulkSerializerMixin
from common.validators import PhoneValidator from common.validators import PhoneValidator
from orgs.utils import current_org from rbac.models import Role
from rbac.builtin import BuiltinRole
from rbac.permissions import RBACPermission from rbac.permissions import RBACPermission
from rbac.models import OrgRoleBinding, SystemRoleBinding from rbac.models import OrgRoleBinding, SystemRoleBinding
from ..models import User from ..models import User
@ -88,7 +89,10 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
# Todo: 这里看看该怎么搞 # Todo: 这里看看该怎么搞
# can_update = serializers.SerializerMethodField(label=_('Can update')) # can_update = serializers.SerializerMethodField(label=_('Can update'))
# can_delete = serializers.SerializerMethodField(label=_('Can delete')) # can_delete = serializers.SerializerMethodField(label=_('Can delete'))
custom_m2m_fields = ('system_roles', 'org_roles') custom_m2m_fields = {
'system_roles': [BuiltinRole.system_user],
'org_roles': [BuiltinRole.org_user]
}
class Meta: class Meta:
model = User model = User
@ -182,10 +186,17 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
attrs.pop('password_strategy', None) attrs.pop('password_strategy', None)
return attrs return attrs
def save_and_set_custom_m2m_fields(self, validated_data, save_handler): def save_and_set_custom_m2m_fields(self, validated_data, save_handler, created):
m2m_values = { m2m_values = {}
f: validated_data.pop(f, None) for f in self.custom_m2m_fields for f, default_roles in self.custom_m2m_fields.items():
} roles = validated_data.pop(f, None)
if created and not roles:
roles = [
Role.objects.filter(id=role.id).first()
for role in default_roles
]
m2m_values[f] = roles
instance = save_handler(validated_data) instance = save_handler(validated_data)
for field_name, value in m2m_values.items(): for field_name, value in m2m_values.items():
if value is None: if value is None:
@ -207,12 +218,12 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
def update(self, instance, validated_data): def update(self, instance, validated_data):
save_handler = partial(super().update, instance) save_handler = partial(super().update, instance)
instance = self.save_and_set_custom_m2m_fields(validated_data, save_handler) instance = self.save_and_set_custom_m2m_fields(validated_data, save_handler, created=False)
return instance return instance
def create(self, validated_data): def create(self, validated_data):
save_handler = super().create save_handler = super().create
instance = self.save_and_set_custom_m2m_fields(validated_data, save_handler) instance = self.save_and_set_custom_m2m_fields(validated_data, save_handler, created=True)
return instance return instance