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

perf: asset perm expire

pull/15031/head
feng 2025-03-13 18:23:33 +08:00 committed by feng626
parent 35bc3a0e2b
commit bd783e6a8d
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/perms/filters.py
View File

@ -38,7 +38,7 @@ class PermissionBaseFilter(BaseFilterSet):
def filter_expired(queryset, name, is_expired): def filter_expired(queryset, name, is_expired):
now = timezone.now() now = timezone.now()
if is_expired: if is_expired:
queryset = queryset.filter(date_start__gt=now).filter(date_expired__lt=now) queryset = queryset.filter(Q(date_start__gt=now) | Q(date_expired__lt=now))
else: else:
queryset = queryset.filter(Q(date_start__lt=now) | Q(date_expired__gt=now)) queryset = queryset.filter(Q(date_start__lt=now) | Q(date_expired__gt=now))
return queryset return queryset
@ -116,7 +116,7 @@ class AssetPermissionFilter(PermissionBaseFilter):
fields = ( fields = (
'user_id', 'username', 'user_group_id', 'user_id', 'username', 'user_group_id',
'user_group', 'node_id', 'node_name', 'asset_id', 'user_group', 'node_id', 'node_name', 'asset_id',
'asset_name', 'name', 'ip', 'name', 'asset_name', 'name', 'ip', 'name', 'is_active',
'all', 'is_valid', 'is_effective', 'from_ticket' 'all', 'is_valid', 'is_effective', 'from_ticket'
) )