github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-22 20:09:54 +00:00
Code Issues Projects Releases Wiki Activity

perf: 工单流对应受理人懒加载

Browse Source
This commit is contained in:
feng626
2021-12-15 19:49:00 +08:00
committed by Jiangjie.Bai
parent ac9e7e9b40
commit 38c870a0b5
6 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ from orgs.mixins.serializers import OrgResourceModelSerializerMixin
from perms.models import AssetPermission
from orgs.models import Organization
from orgs.utils import tmp_to_org
from users.models import User
from tickets.models import Ticket, TicketFlow, ApprovalRule
from tickets.const import TicketApprovalStrategy
from .meta import type_serializer_classes_mapping
@@ -139,7 +138,8 @@ class TicketApproveSerializer(TicketSerializer):
class TicketFlowApproveSerializer(serializers.ModelSerializer):
strategy_display = serializers.ReadOnlyField(source='get_strategy_display', label=_('Approve strategy'))
assignees_read_only = serializers.SerializerMethodField(label=_("Assignees"))
assignees_read_only = serializers.SerializerMethodField(label=_('Assignees'))
assignees_display = serializers.SerializerMethodField(label=_('Assignees display'))
class Meta:
model = ApprovalRule
@@ -153,6 +153,9 @@ class TicketFlowApproveSerializer(serializers.ModelSerializer):
'assignees': {'write_only': True, 'allow_empty': True, 'required': False}
}
def get_assignees_display(self, obj):
return [str(assignee) for assignee in obj.get_assignees()]
def get_assignees_read_only(self, obj):
if obj.strategy == TicketApprovalStrategy.custom_user:
return obj.assignees.values_list('id', flat=True)
@@ -190,7 +193,9 @@ class TicketFlowSerializer(OrgResourceModelSerializerMixin):
raise serializers.ValidationError(error)
return value
def create_or_update(self, action, validated_data, related, assignees, instance=None):
def create_or_update(self, action, validated_data, instance=None):
related = 'rules'
assignees = 'assignees'
childs = validated_data.pop(related, [])
if not instance:
instance = getattr(super(), action)(validated_data)
@@ -203,12 +208,6 @@ class TicketFlowSerializer(OrgResourceModelSerializerMixin):
for level, data in enumerate(childs, 1):
data_m2m = data.pop(assignees, None)
child_instance = related_model.objects.create(**data, level=level)
if child_instance.strategy == TicketApprovalStrategy.super_admin:
data_m2m = list(User.get_super_admins())
elif child_instance.strategy == TicketApprovalStrategy.org_admin:
data_m2m = list(User.get_org_admins())
elif child_instance.strategy == TicketApprovalStrategy.super_org_admin:
data_m2m = list(User.get_super_and_org_admins())
getattr(child_instance, assignees).set(data_m2m)
child_instances.append(child_instance)
instance_related.set(child_instances)
@@ -216,12 +215,12 @@ class TicketFlowSerializer(OrgResourceModelSerializerMixin):
@atomic
def create(self, validated_data):
return self.create_or_update('create', validated_data, 'rules', 'assignees')
return self.create_or_update('create', validated_data)
@atomic
def update(self, instance, validated_data):
if instance.org_id == Organization.ROOT_ID:
instance = self.create(validated_data)
else:
instance = self.create_or_update('update', validated_data, 'rules', 'assignees', instance)
instance = self.create_or_update('update', validated_data, instance)
return instance