github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

perf: migrate (#9098)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot
2022-11-18 11:30:31 +08:00
committed by GitHub
parent b1bd57cd76
commit 223814f897
24 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/tickets/models/ticket/apply_application.py
View File

@@ -1,7 +1,6 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from perms.models import Action
from .general import Ticket
__all__ = ['ApplyApplicationTicket']
@@ -23,14 +22,10 @@ class ApplyApplicationTicket(Ticket):
'assets.SystemUser', verbose_name=_('Apply system users'),
)
apply_actions = models.IntegerField(
choices=Action.DB_CHOICES, default=Action.ALL, verbose_name=_('Actions')
choices=[
(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download'),
(8, 'Clipboard copy'), (16, 'Clipboard paste'), (24, 'Clipboard copy paste')
], default=255, verbose_name=_('Actions')
)
apply_date_start = models.DateTimeField(verbose_name=_('Date start'), null=True)
apply_date_expired = models.DateTimeField(verbose_name=_('Date expired'), null=True)
@property
def apply_actions_display(self):
return Action.value_to_choices_display(self.apply_actions)
def get_apply_actions_display(self):
return ', '.join(self.apply_actions_display)

10
apps/tickets/models/ticket/general.py
View File

@@ -5,23 +5,23 @@ from typing import Callable
from django.db import models
from django.db.models import Q
from django.utils.translation import ugettext_lazy as _
from django.forms import model_to_dict
from django.db.utils import IntegrityError
from django.db.models.fields import related
from django.forms import model_to_dict
from django.utils.translation import ugettext_lazy as _
from orgs.utils import tmp_to_org
from orgs.models import Organization
from common.exceptions import JMSException
from common.utils.timezone import as_current_tz
from common.mixins.models import CommonModelMixin
from common.db.encoder import ModelJSONFieldEncoder
from orgs.models import Organization
from orgs.utils import tmp_to_org
from tickets.const import (
TicketType, TicketStatus, TicketState,
TicketLevel, StepState, StepStatus
)
from tickets.handlers import get_ticket_handler
from tickets.errors import AlreadyClosed
from tickets.handlers import get_ticket_handler
from ..flow import TicketFlow
__all__ = [