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

fix: 资产授权不能打开或关闭

pull/6277/head
xinwen 2021-06-15 17:59:43 +08:00 committed by Jiangjie.Bai
parent 067a70463e
commit 937acbd0b5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/perms/serializers/asset/permission.py
View File

@ -83,14 +83,17 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
return queryset return queryset
def to_internal_value(self, data): def to_internal_value(self, data):
# 系统用户是必填项 if 'system_users_display' in data:
# system_users_display 转化为 system_users
system_users = data.get('system_users', []) system_users = data.get('system_users', [])
system_users_display = data.pop('system_users_display', '') system_users_display = data.pop('system_users_display')
for i in range(len(system_users_display)):
system_user = SystemUser.objects.filter(name=system_users_display[i]).first() for name in system_users_display:
system_user = SystemUser.objects.filter(name=name).first()
if system_user and system_user.id not in system_users: if system_user and system_user.id not in system_users:
system_users.append(system_user.id) system_users.append(system_user.id)
data['system_users'] = system_users data['system_users'] = system_users
return super().to_internal_value(data) return super().to_internal_value(data)
def perform_display_create(self, instance, **kwargs): def perform_display_create(self, instance, **kwargs):