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

[Update] 修改command options get view filter

pull/3902/head
ibuler 2020-04-16 11:27:46 +08:00
parent 93bf15adc9
commit 3648a1458b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,8 +84,7 @@ class SimpleMetadataWithFilters(SimpleMetadata):
def get_filters_fields(self, request, view): def get_filters_fields(self, request, view):
fields = [] fields = []
if hasattr(view, 'get_filter_fields'): if hasattr(view, 'get_filter_fields'):
# fields = view.get_filter_fields(request) fields = view.get_filter_fields(request)
fields = view.get_filter_fields()
elif hasattr(view, 'filter_fields'): elif hasattr(view, 'filter_fields'):
fields = view.filter_fields fields = view.filter_fields
return fields return fields
@ -93,9 +92,9 @@ class SimpleMetadataWithFilters(SimpleMetadata):
def get_ordering_fields(self, request, view): def get_ordering_fields(self, request, view):
fields = [] fields = []
if hasattr(view, 'get_ordering_fields'): if hasattr(view, 'get_ordering_fields'):
fields = view.get_filter_fields(request) fields = view.get_ordering_fields(request)
elif hasattr(view, 'ordering_fields'): elif hasattr(view, 'ordering_fields'):
fields = view.filter_fields fields = view.ordering_fields
return fields return fields
def determine_metadata(self, request, view): def determine_metadata(self, request, view):

2
apps/terminal/api/command.py
View File

@ -63,7 +63,7 @@ class CommandQueryMixin:
def filter_queryset(self, queryset): def filter_queryset(self, queryset):
return queryset return queryset
def get_filter_fields(self): def get_filter_fields(self, request):
fields = self.filter_fields fields = self.filter_fields
fields.extend(["date_from", "date_to"]) fields.extend(["date_from", "date_to"])
return fields return fields