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

fix: 修复由于修改filter引起的问题

pull/6969/head
ibuler 2021-09-27 18:44:13 +08:00 committed by 老广
parent 476e6cdc2f
commit 8c3ab31e4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/drf/metadata.py
View File

@ -102,13 +102,13 @@ class SimpleMetadataWithFilters(SimpleMetadata):
elif hasattr(view, 'get_filterset_fields'): elif hasattr(view, 'get_filterset_fields'):
fields = view.get_filterset_fields(request) fields = view.get_filterset_fields(request)
elif hasattr(view, 'filterset_class'): elif hasattr(view, 'filterset_class'):
fields = view.filterset_class.Meta.fields + \ fields = list(view.filterset_class.Meta.fields) + \
list(view.filterset_class.declared_filters.keys()) list(view.filterset_class.declared_filters.keys())
if hasattr(view, 'custom_filter_fields'): if hasattr(view, 'custom_filter_fields'):
# 不能写 fields += view.custom_filter_fields # 不能写 fields += view.custom_filter_fields
# 会改变 view 的 filter_fields # 会改变 view 的 filter_fields
fields = list(fields) + view.custom_filter_fields fields = list(fields) + list(view.custom_filter_fields)
if isinstance(fields, dict): if isinstance(fields, dict):
fields = list(fields.keys()) fields = list(fields.keys())