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

Merge pull request #10004 from jumpserver/pr@v3.1@perf_import_export 

perf: 优化导入导出
pull/10024/head
老广 2023-03-20 09:58:39 +08:00 committed by GitHub
parent 234554060a 5fddd0b02b
commit d1e5559a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/serializers/account/account.py
View File

@ -81,7 +81,7 @@ class AccountAssetSerializer(serializers.ModelSerializer):
def to_internal_value(self, data): def to_internal_value(self, data):
if isinstance(data, dict): if isinstance(data, dict):
i = data.get('id') i = data.get('id') or data.get('pk')
else: else:
i = data i = data

2
apps/common/drf/parsers/base.py
View File

@ -111,7 +111,7 @@ class BaseFileParser(BaseParser):
return {'pk': obj_id, 'name': obj_name} return {'pk': obj_id, 'name': obj_name}
def parse_value(self, field, value): def parse_value(self, field, value):
if value is '-': if value == '-' and field and field.allow_null:
return None return None
elif hasattr(field, 'to_file_internal_value'): elif hasattr(field, 'to_file_internal_value'):
value = field.to_file_internal_value(value) value = field.to_file_internal_value(value)