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

fix: Ticket filter error

pull/15692/head
wangruidong 2025-07-02 16:56:39 +08:00 committed by 老广
parent baaaf83ab9
commit 1e5a995917
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/tickets/const.py
View File

@ -14,6 +14,7 @@ class TicketType(TextChoices):
class TicketState(TextChoices): class TicketState(TextChoices):
all = 'all', _('All')
pending = 'pending', _('Open') pending = 'pending', _('Open')
closed = 'closed', _("Cancel") closed = 'closed', _("Cancel")
approved = 'approved', _('Approved') approved = 'approved', _('Approved')

6
apps/tickets/filters.py
View File

@ -14,6 +14,7 @@ class TicketFilter(BaseFilterSet):
relevant_asset = filters.CharFilter(method='filter_relevant_asset') relevant_asset = filters.CharFilter(method='filter_relevant_asset')
relevant_command = filters.CharFilter(method='filter_relevant_command') relevant_command = filters.CharFilter(method='filter_relevant_command')
applicant_username_name = filters.CharFilter(method='filter_applicant_username_name') applicant_username_name = filters.CharFilter(method='filter_applicant_username_name')
state = filters.CharFilter(method='filter_state')
class Meta: class Meta:
model = Ticket model = Ticket
@ -65,6 +66,11 @@ class TicketFilter(BaseFilterSet):
Q(applicant__username__icontains=value) Q(applicant__username__icontains=value)
) )
def filter_state(self, queryset, name, value):
if value == 'all':
return queryset
return queryset.filter(state=value)
class ApplyAssetTicketFilter(BaseFilterSet): class ApplyAssetTicketFilter(BaseFilterSet):
class Meta: class Meta: