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

fix(csv): 修复`JMSCSVParser`调用`serializer`导致循环调用问题

pull/4424/head
xinwen 2020-07-28 20:28:38 +08:00 committed by 老广
parent 3e6cd1c1d3
commit 34b188bbe7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/common/drf/parsers/csv.py
View File

@ -47,9 +47,9 @@ class JMSCSVParser(BaseParser):
yield row yield row
@staticmethod @staticmethod
def _get_fields_map(serializer): def _get_fields_map(serializer_cls):
fields_map = {} fields_map = {}
fields = serializer.fields fields = serializer_cls().fields
fields_map.update({v.label: k for k, v in fields.items()}) fields_map.update({v.label: k for k, v in fields.items()})
fields_map.update({k: k for k, _ in fields.items()}) fields_map.update({k: k for k, _ in fields.items()})
return fields_map return fields_map
@ -101,7 +101,7 @@ class JMSCSVParser(BaseParser):
try: try:
view = parser_context['view'] view = parser_context['view']
meta = view.request.META meta = view.request.META
serializer = view.get_serializer() serializer_cls = view.get_serializer_class()
except Exception as e: except Exception as e:
logger.debug(e, exc_info=True) logger.debug(e, exc_info=True)
raise ParseError('The resource does not support imports!') raise ParseError('The resource does not support imports!')
@ -121,7 +121,7 @@ class JMSCSVParser(BaseParser):
rows = self._gen_rows(binary, charset=encoding) rows = self._gen_rows(binary, charset=encoding)
header = next(rows) header = next(rows)
fields_map = self._get_fields_map(serializer) fields_map = self._get_fields_map(serializer_cls)
header = [fields_map.get(name.strip('*'), '') for name in header] header = [fields_map.get(name.strip('*'), '') for name in header]
data = [] data = []