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

fix: 全局组织命令记录无数据

pull/6422/head
xinwen 2021-07-12 20:23:44 +08:00 committed by 老广
parent 4e3b3442d2
commit f6a26ac165
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/terminal/filters.py
View File

@ -1,7 +1,7 @@
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from django.db.models import QuerySet from django.db.models import QuerySet
from orgs.utils import current_org from orgs.utils import current_org, filter_org_queryset
from terminal.models import Command, CommandStorage from terminal.models import Command, CommandStorage
@ -26,7 +26,7 @@ class CommandFilter(filters.FilterSet):
@property @property
def qs(self): def qs(self):
qs = super().qs qs = super().qs
qs = qs.filter(org_id=self.get_org_id()) qs = filter_org_queryset(qs)
qs = self.filter_by_timestamp(qs) qs = self.filter_by_timestamp(qs)
return qs return qs
@ -46,11 +46,6 @@ class CommandFilter(filters.FilterSet):
qs = qs.filter(**filters) qs = qs.filter(**filters)
return qs return qs
@staticmethod
def get_org_id():
org_id = current_org.id
return org_id
class CommandFilterForStorageTree(CommandFilter): class CommandFilterForStorageTree(CommandFilter):
asset = filters.CharFilter(method='do_nothing') asset = filters.CharFilter(method='do_nothing')