merge: with v3

apps/tickets/api/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-from .ticket import *
 from .flow import *
+from .ticket import *
 from .comment import *
-from .super_ticket import *
 from .relation import *
+from .super_ticket import *

apps/tickets/api/comment.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-
 from rest_framework import viewsets, mixins
+
 from common.exceptions import JMSException
 from common.utils import lazyproperty
 from rbac.permissions import RBACPermission

apps/tickets/api/flow.py

@@ -9,7 +9,6 @@ __all__ = ['TicketFlowViewSet']
 
 class TicketFlowViewSet(JMSBulkModelViewSet):
     serializer_class = serializers.TicketFlowSerializer
-
     filterset_fields = ['id', 'type']
     search_fields = ['id', 'type']
 

apps/tickets/api/relation.py

@@ -1,13 +1,13 @@
-from rest_framework.mixins import CreateModelMixin
 from rest_framework import views
-from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.mixins import CreateModelMixin
 
+from orgs.utils import tmp_to_root_org
 from common.drf.api import JMSGenericViewSet
+from terminal.serializers import SessionSerializer
 from tickets.models import TicketSession
 from tickets.serializers import TicketSessionRelationSerializer
-from terminal.serializers import SessionSerializer
-from orgs.utils import tmp_to_root_org
 
 
 class TicketSessionRelationViewSet(CreateModelMixin, JMSGenericViewSet):

apps/tickets/api/super_ticket.py

@@ -1,9 +1,8 @@
 from rest_framework.generics import RetrieveDestroyAPIView
 
 from orgs.utils import tmp_to_root_org
-from ..serializers import SuperTicketSerializer
 from ..models import Ticket
-
+from ..serializers import SuperTicketSerializer
 
 __all__ = ['SuperTicketStatusAPI']
 

apps/tickets/api/ticket.py

@@ -5,31 +5,28 @@ from rest_framework.decorators import action
 from rest_framework.response import Response
 from rest_framework.exceptions import MethodNotAllowed
 
-from common.const.http import POST, PUT, PATCH
-from common.mixins.api import CommonApiMixin
 from orgs.utils import tmp_to_root_org
-
 from rbac.permissions import RBACPermission
-
-from tickets import serializers
+from common.mixins.api import CommonApiMixin
+from common.const.http import POST, PUT, PATCH
 from tickets import filters
-from tickets.permissions.ticket import IsAssignee, IsApplicant
+from tickets import serializers
 from tickets.models import (
-    Ticket, ApplyAssetTicket, ApplyApplicationTicket,
-    ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket
+    Ticket, ApplyAssetTicket, ApplyLoginTicket,
+    ApplyLoginAssetTicket, ApplyCommandTicket
 )
+from tickets.permissions.ticket import IsAssignee, IsApplicant
 
 __all__ = [
-    'TicketViewSet', 'ApplyAssetTicketViewSet', 'ApplyApplicationTicketViewSet',
-    'ApplyLoginTicketViewSet', 'ApplyLoginAssetTicketViewSet', 'ApplyCommandTicketViewSet'
+    'TicketViewSet', 'ApplyAssetTicketViewSet',
+    'ApplyLoginTicketViewSet', 'ApplyLoginAssetTicketViewSet',
+    'ApplyCommandTicketViewSet'
 ]
 
 
 class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
-    serializer_class = serializers.TicketDisplaySerializer
+    serializer_class = serializers.TicketSerializer
     serializer_classes = {
-        'list': serializers.TicketListSerializer,
-        'open': serializers.TicketApplySerializer,
         'approve': serializers.TicketApproveSerializer
     }
     model = Ticket
@@ -39,8 +36,8 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
         'title', 'type', 'status'
     ]
     ordering_fields = (
-        'title', 'status', 'state',
-        'action_display', 'date_created', 'serial_num',
+        'title', 'status', 'state', 'action_display',
+        'date_created', 'serial_num',
     )
     ordering = ('-date_created',)
     rbac_perms = {
@@ -95,38 +92,28 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
 
 
 class ApplyAssetTicketViewSet(TicketViewSet):
-    serializer_class = serializers.ApplyAssetDisplaySerializer
+    model = ApplyAssetTicket
+    filterset_class = filters.ApplyAssetTicketFilter
+    serializer_class = serializers.ApplyAssetSerializer
     serializer_classes = {
         'open': serializers.ApplyAssetSerializer,
         'approve': serializers.ApproveAssetSerializer
     }
-    model = ApplyAssetTicket
-    filterset_class = filters.ApplyAssetTicketFilter
-
-
-class ApplyApplicationTicketViewSet(TicketViewSet):
-    serializer_class = serializers.ApplyApplicationDisplaySerializer
-    serializer_classes = {
-        'open': serializers.ApplyApplicationSerializer,
-        'approve': serializers.ApproveApplicationSerializer
-    }
-    model = ApplyApplicationTicket
-    filterset_class = filters.ApplyApplicationTicketFilter
 
 
 class ApplyLoginTicketViewSet(TicketViewSet):
-    serializer_class = serializers.LoginConfirmSerializer
     model = ApplyLoginTicket
     filterset_class = filters.ApplyLoginTicketFilter
+    serializer_class = serializers.LoginConfirmSerializer
 
 
 class ApplyLoginAssetTicketViewSet(TicketViewSet):
-    serializer_class = serializers.LoginAssetConfirmSerializer
     model = ApplyLoginAssetTicket
     filterset_class = filters.ApplyLoginAssetTicketFilter
+    serializer_class = serializers.LoginAssetConfirmSerializer
 
 
 class ApplyCommandTicketViewSet(TicketViewSet):
-    serializer_class = serializers.ApplyCommandConfirmSerializer
     model = ApplyCommandTicket
     filterset_class = filters.ApplyCommandTicketFilter
+    serializer_class = serializers.ApplyCommandConfirmSerializer