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

feat: 优化工单模块 (#5361)

Browse Source 
* feat: 优化工单模块1

* feat: 优化工单模块2

* feat: 优化工单模块3

Co-authored-by: Bai <bugatti_it@163.com>
This commit is contained in:
fit2bot
2020-12-30 18:14:06 +08:00
committed by GitHub
parent 3b056ff953
commit 430e20a49c
22 changed files with 342 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ class TicketDisplaySerializer(TicketSerializer):
class TicketActionSerializer(TicketSerializer):
action = ReadableHiddenField(default=const.TicketActionChoices.apply.value)
action = ReadableHiddenField(default=const.TicketActionChoices.open.value)
class Meta(TicketSerializer.Meta):
required_fields = ['action']
@@ -94,7 +94,7 @@ class TicketApplySerializer(TicketActionSerializer):
@staticmethod
def validate_action(action):
return const.TicketActionChoices.apply.value
return const.TicketActionChoices.open.value
class TicketProcessSerializer(TicketActionSerializer):
@@ -110,13 +110,11 @@ class TicketApproveSerializer(TicketProcessSerializer):
class Meta(TicketProcessSerializer.Meta):
required_fields = TicketProcessSerializer.Meta.required_fields + ['meta']
read_only_fields = list(set(TicketDisplaySerializer.Meta.fields) - set(required_fields))
extra_kwargs = {
'meta': {'read_only': True}
}
def validate_meta(self, meta):
meta.update(self.instance.meta)
return meta
instance_meta = self.instance.meta
instance_meta.update(meta)
return instance_meta
@staticmethod
def validate_action(action):