mirror of https://github.com/jumpserver/jumpserver
修复授权导入系统用户为空报错
parent
4382921c57
commit
c7dfd0edce
|
@ -83,22 +83,14 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
def to_internal_value(self, data):
|
def to_internal_value(self, data):
|
||||||
if not data['assets']:
|
|
||||||
data['assets'] = []
|
|
||||||
if not data['system_users']:
|
|
||||||
data['system_users'] = []
|
|
||||||
if not data['users']:
|
|
||||||
data['users'] = []
|
|
||||||
if not data['user_groups']:
|
|
||||||
data['user_groups'] = []
|
|
||||||
if not data['nodes']:
|
|
||||||
data['nodes'] = []
|
|
||||||
# 系统用户是必填项
|
# 系统用户是必填项
|
||||||
|
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)):
|
for i in range(len(system_users_display)):
|
||||||
system_user = SystemUser.objects.filter(name=system_users_display[i]).first()
|
system_user = SystemUser.objects.filter(name=system_users_display[i]).first()
|
||||||
if system_user and system_user.id not in data['system_users']:
|
if system_user and system_user.id not in system_users:
|
||||||
data['system_users'].append(system_user.id)
|
system_users.append(system_user.id)
|
||||||
|
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):
|
||||||
|
|
Loading…
Reference in New Issue