github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-03-18 19:12:07 +00:00
Code Issues Projects Releases Wiki Activity

fix: ticket status filter fields (#16646)

Browse Source
This commit is contained in:
fit2bot
2026-03-03 16:28:13 +08:00
committed by GitHub
parent 5c13d95c33
commit b028fec6d1
12 changed files with 6468 additions and 3906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

277
apps/i18n/core/en/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1312
apps/i18n/core/es/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1771
apps/i18n/core/ja/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1753
apps/i18n/core/ko/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1179
apps/i18n/core/pt_BR/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1241
apps/i18n/core/ru/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1243
apps/i18n/core/vi/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

310
apps/i18n/core/zh/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

1258
apps/i18n/core/zh_Hant/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

26
apps/tickets/const.py
View File

@@ -15,28 +15,28 @@ class TicketType(TextChoices):
class TicketState(TextChoices):
all = 'all', _('All')
pending = 'pending', _('Open')
closed = 'closed', _("Cancel")
approved = 'approved', _('Approved')
rejected = 'rejected', _('Rejected')
pending = 'pending', _('Ticket open')
closed = 'closed', _("Ticket closed")
approved = 'approved', _('Ticket approved')
rejected = 'rejected', _('Ticket rejected')
class TicketStatus(TextChoices):
open = 'open', _("Open")
closed = 'closed', _("Finished")
open = 'open', _("Ticket open")
closed = 'closed', _("Ticket finished")
class StepState(TextChoices):
pending = 'pending', _('Pending')
closed = 'closed', _("Closed")
approved = 'approved', _('Approved')
rejected = 'rejected', _('Rejected')
pending = 'pending', _('Step pending')
closed = 'closed', _("Step closed")
approved = 'approved', _('Step approved')
rejected = 'rejected', _('Step rejected')
class StepStatus(TextChoices):
active = 'active', _('Active')
closed = 'closed', _("Closed")
pending = 'pending', _('Pending')
active = 'active', _('Step active')
closed = 'closed', _("Step closed")
pending = 'pending', _('Step pending')
class TicketAction(TextChoices):

2
apps/tickets/filters.py
View File

@@ -21,7 +21,7 @@ class TicketFilter(BaseFilterSet):
class Meta:
model = Ticket
fields = (
'id', 'title', 'type', 'state',
'id', 'title', 'type', 'state', 'status',
'applicant', 'assignees__id', 'org_name', 'org_id'
)

2
apps/tickets/serializers/ticket/ticket.py
View File

@@ -18,7 +18,7 @@ __all__ = [
class TicketSerializer(OrgResourceModelSerializerMixin):
type = LabeledChoiceField(choices=TicketType.choices, read_only=True, label=_('Type'))
status = LabeledChoiceField(choices=TicketStatus.choices, read_only=True, label=_('Status'))
state = LabeledChoiceField(choices=TicketState.choices, read_only=True, label=_("Status"))
state = LabeledChoiceField(choices=TicketState.choices, read_only=True, label=_("State"))
process_map = serializers.JSONField(read_only=True, default=list, label=_('Process map'))
class Meta: