github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-05 09:21:02 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复导入导出文件时对于bool类型字段的判断问题

Browse Source
This commit is contained in:
Jiangjie.Bai
2022-06-30 18:21:12 +08:00
committed by Jiangjie.Bai
parent 8e65975cd7
commit 011e9ffec4
9 changed files with 410 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,10 +99,16 @@ class BaseFileParser(BaseParser):
new_row_data = {}
serializer_fields = self.serializer_fields
for k, v in row_data.items():
if type(v) in [list, dict, int] or (isinstance(v, str) and k.strip() and v.strip()):
# 解决类似disk_info为字符串的'{}'的问题
if type(v) in [list, dict, int, bool] or (isinstance(v, str) and k.strip() and v.strip()):
# 处理类似disk_info为字符串的'{}'的问题
if not isinstance(v, str) and isinstance(serializer_fields[k], serializers.CharField):
v = str(v)
# 处理 BooleanField 的问题, 导出是 'True', 'False'
if isinstance(v, str) and v.strip().lower() == 'true':
v = True
elif isinstance(v, str) and v.strip().lower() == 'false':
v = False
new_row_data[k] = v
return new_row_data